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;