lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: serio_raw - return proper result when serio_raw_read fails

Browse Source 
serio_raw_read now returns (sometimes partially) successful number of
bytes transferred to the caller, and only returns error code to the
caller on completely failed transfers.

Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Che-Liang Chiou
2012-02-01 09:25:35 -08:00
committed by Dmitry Torokhov
parent d04df0232d
commit 7a0a27d2ce
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/input/serio/serio_raw.c
View File

@@ -164,7 +164,8 @@ static ssize_t serio_raw_read(struct file *file, char __user *buffer,
struct serio_raw_client *client = file->private_data; struct serio_raw_client *client = file->private_data;
struct serio_raw *serio_raw = client->serio_raw; struct serio_raw *serio_raw = client->serio_raw;
char uninitialized_var(c); char uninitialized_var(c);
ssize_t retval = 0; ssize_t read = 0;
int retval;
if (serio_raw->dead) if (serio_raw->dead)
return -ENODEV; return -ENODEV;
@@ -180,13 +181,15 @@ static ssize_t serio_raw_read(struct file *file, char __user *buffer,
if (serio_raw->dead) if (serio_raw->dead)
return -ENODEV; return -ENODEV;
while (retval < count && serio_raw_fetch_byte(serio_raw, &c)) { while (read < count && serio_raw_fetch_byte(serio_raw, &c)) {
if (put_user(c, buffer++)) if (put_user(c, buffer++)) {
return -EFAULT; retval = -EFAULT;
retval++; break;
}
read++;
} }
return retval; return read ?: retval;
} }
static ssize_t serio_raw_write(struct file *file, const char __user *buffer, static ssize_t serio_raw_write(struct file *file, const char __user *buffer,