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>
@@ -192,8 +192,11 @@ static int evdev_open_device(struct evdev *evdev)
if (!evdev->exist)
retval = -ENODEV;
- else if (!evdev->open++)
+ else if (!evdev->open++) {
retval = input_open_device(&evdev->handle);
+ if (retval)
+ evdev->open--;
+ }
mutex_unlock(&evdev->mutex);
return retval;
@@ -205,8 +205,11 @@ static int joydev_open_device(struct joydev *joydev)
if (!joydev->exist)
- else if (!joydev->open++)
+ else if (!joydev->open++) {
retval = input_open_device(&joydev->handle);
+ joydev->open--;
mutex_unlock(&joydev->mutex);
@@ -428,8 +428,11 @@ static int mousedev_open_device(struct mousedev *mousedev)
mixdev_open_devices();
else if (!mousedev->exist)
- else if (!mousedev->open++)
+ else if (!mousedev->open++) {
retval = input_open_device(&mousedev->handle);
+ mousedev->open--;
mutex_unlock(&mousedev->mutex);
@@ -185,8 +185,11 @@ static int tsdev_open_device(struct tsdev *tsdev)
if (!tsdev->exist)
- else if (!tsdev->open++)
+ else if (!tsdev->open++) {
retval = input_open_device(&tsdev->handle);
+ tsdev->open--;
mutex_unlock(&tsdev->mutex);