diff options
| author | Oliver Neukum <oliver@neukum.org> | 2007-10-12 20:18:40 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 20:18:40 +0200 |
| commit | 064450140f1eab959bd0eca0245f449993216074 (patch) | |
| tree | ae8c7e238224b74e90f860129b1236c3eeedc470 /drivers/input/joydev.c | |
| parent | Input: keyboard - add CapsShift lock (diff) | |
| download | linux-064450140f1eab959bd0eca0245f449993216074.tar.xz linux-064450140f1eab959bd0eca0245f449993216074.zip | |
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) if (!joydev->exist) retval = -ENODEV; - else if (!joydev->open++) + else if (!joydev->open++) { retval = input_open_device(&joydev->handle); + if (retval) + joydev->open--; + } mutex_unlock(&joydev->mutex); return retval; |