diff options
author | Oliver Neukum <oliver@neukum.org> | 2007-10-12 14:18:40 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 14:18:40 -0400 |
commit | 064450140f1eab959bd0eca0245f449993216074 (patch) | |
tree | ae8c7e238224b74e90f860129b1236c3eeedc470 /drivers/input/joydev.c | |
parent | 1ea3abf7fbc39b3b543d7438159ba07b6411561c (diff) |
Input: fix open count handling in input interfaces
If input_open_device() fails we should not leave interfaces marked
as opened.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r-- | drivers/input/joydev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index a4272d63c4d6..f306c97f556d 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
@@ -205,8 +205,11 @@ static int joydev_open_device(struct joydev *joydev) | |||
205 | 205 | ||
206 | if (!joydev->exist) | 206 | if (!joydev->exist) |
207 | retval = -ENODEV; | 207 | retval = -ENODEV; |
208 | else if (!joydev->open++) | 208 | else if (!joydev->open++) { |
209 | retval = input_open_device(&joydev->handle); | 209 | retval = input_open_device(&joydev->handle); |
210 | if (retval) | ||
211 | joydev->open--; | ||
212 | } | ||
210 | 213 | ||
211 | mutex_unlock(&joydev->mutex); | 214 | mutex_unlock(&joydev->mutex); |
212 | return retval; | 215 | return retval; |