diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-24 15:02:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-24 15:02:48 +0300 |
| commit | db25f440f42eca380fcdb339f51cf73633e32485 (patch) | |
| tree | d67c8ec502c2ce8b1382538545ee1b8a439dc6e2 /drivers/input/evdev.c | |
| parent | 145d92e77e6f34f53773fdb06789816ec2b6c7b3 (diff) | |
| parent | 83510441bc08bee201c0ded9d81da6dfd008d69a (diff) | |
| download | linux-db25f440f42eca380fcdb339f51cf73633e32485.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/input/evdev.c')
| -rw-r--r-- | drivers/input/evdev.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 9d35499faca4..08d496411f75 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -290,19 +290,14 @@ static int evdev_flush(struct file *file, fl_owner_t id) { struct evdev_client *client = file->private_data; struct evdev *evdev = client->evdev; - int retval; - retval = mutex_lock_interruptible(&evdev->mutex); - if (retval) - return retval; + mutex_lock(&evdev->mutex); - if (!evdev->exist || client->revoked) - retval = -ENODEV; - else - retval = input_flush_device(&evdev->handle, file); + if (evdev->exist && !client->revoked) + input_flush_device(&evdev->handle, file); mutex_unlock(&evdev->mutex); - return retval; + return 0; } static void evdev_free(struct device *dev) |