diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 02:28:35 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 02:28:35 -0400 |
| commit | 57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch) | |
| tree | ee9289f0898054474b7e5054abdb3ffb78666436 /drivers/input/evdev.c | |
| parent | 486c8aba39e5f194519cd5c0e85e5d1de8b74b03 (diff) | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
Merge commit 'v3.4-rc4' into next
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 cfe78597eb68..4b2e10d5d641 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c | |||
| @@ -341,7 +341,7 @@ static ssize_t evdev_write(struct file *file, const char __user *buffer, | |||
| 341 | struct evdev_client *client = file->private_data; | 341 | struct evdev_client *client = file->private_data; |
| 342 | struct evdev *evdev = client->evdev; | 342 | struct evdev *evdev = client->evdev; |
| 343 | struct input_event event; | 343 | struct input_event event; |
| 344 | int retval; | 344 | int retval = 0; |
| 345 | 345 | ||
| 346 | if (count < input_event_size()) | 346 | if (count < input_event_size()) |
| 347 | return -EINVAL; | 347 | return -EINVAL; |