diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 12:00:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-09 12:00:22 +0000 |
| commit | a08a499aa3d85b605b5669cfc82b8e14232f7e91 (patch) | |
| tree | fd82da95552c996e9522a068ec77eae3a5ac6eec /drivers/input/evdev.c | |
| parent | 6d70934a0248d0d92e01116807c02c00ae172299 (diff) | |
| parent | d65b4e98d7ea3038b767b70fe8be959b2913f16d (diff) | |
| download | lwn-a08a499aa3d85b605b5669cfc82b8e14232f7e91.tar.gz lwn-a08a499aa3d85b605b5669cfc82b8e14232f7e91.zip | |
Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
colliding annoyingly with development.
Linux 3.3-rc3
.. the number of the half-beast?
Conflicts:
sound/soc/codecs/wm5100.c
sound/soc/codecs/wm8994.c
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, 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; |