diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 16:23:15 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-27 16:23:21 +0000 |
| commit | a173fc693b25216c5c834978f4fafd731fd4ff94 (patch) | |
| tree | f75c2fa106217cc3afd1bde6803ca77fe953bbcf /drivers/input/evdev.c | |
| parent | d052e161c4067cf21daacb1de960a1e449babfe4 (diff) | |
| parent | 759a45185ac0e4dfaf8bbfcb390ec73aca4b7a34 (diff) | |
Merge branch 'kirkwood/board' into next/boards
* kirkwood/board: (2 commits)
ARM: kirkwood: convert uart0 to devicetree.
ARM: kirkwood: add dreamplug (fdt) support.
Series sent by email from Jason Cooper <jason@lakedaemon.net>
Update to Linux 3.3-rc3
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 76457d50bc3..afc166fcc3d 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, struct evdev_client *client = file->private_data; struct evdev *evdev = client->evdev; struct input_event event; - int retval; + int retval = 0; if (count < input_event_size()) return -EINVAL; |