diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
| commit | 3f60db4bde17088feed5f143582d7661cdbb9a01 (patch) | |
| tree | 21a7866ae6d199cfa8f619ced9500687bdf84f18 /drivers/input/evdev.c | |
| parent | 5e36097889725dbe4f098c3f1e93cb2f21cae6ee (diff) | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
Merge commit 'v3.3-rc4'
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 76457d50bc34..afc166fcc3d9 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -386,7 +386,7 @@ static ssize_t evdev_read(struct file *file, char __user *buffer, | |||
| 386 | struct evdev_client *client = file->private_data; | 386 | struct evdev_client *client = file->private_data; |
| 387 | struct evdev *evdev = client->evdev; | 387 | struct evdev *evdev = client->evdev; |
| 388 | struct input_event event; | 388 | struct input_event event; |
| 389 | int retval; | 389 | int retval = 0; |
| 390 | 390 | ||
| 391 | if (count < input_event_size()) | 391 | if (count < input_event_size()) |
| 392 | return -EINVAL; | 392 | return -EINVAL; |