Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -61,6 +61,9 @@
|
||||
#include <media/lirc_dev.h>
|
||||
#include <media/lirc.h>
|
||||
|
||||
/* Max transfer size done by I2C transfer functions */
|
||||
#define MAX_XFER_SIZE 64
|
||||
|
||||
struct IR;
|
||||
|
||||
struct IR_rx {
|
||||
@@ -941,7 +944,14 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
|
||||
schedule();
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
} else {
|
||||
unsigned char buf[rbuf->chunk_size];
|
||||
unsigned char buf[MAX_XFER_SIZE];
|
||||
|
||||
if (rbuf->chunk_size > sizeof(buf)) {
|
||||
zilog_error("chunk_size is too big (%d)!\n",
|
||||
rbuf->chunk_size);
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
m = lirc_buffer_read(rbuf, buf);
|
||||
if (m == rbuf->chunk_size) {
|
||||
ret = copy_to_user((void *)outbuf+written, buf,
|
||||
|
||||
Reference in New Issue
Block a user