Input: joysticks - handle errors when registering input devices

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/input/joystick/stinger.c b/drivers/input/joystick/stinger.c
index 1ffb03223311..b51a4a4c7f60 100644
--- a/drivers/input/joystick/stinger.c
+++ b/drivers/input/joystick/stinger.c
@@ -143,7 +143,7 @@ static int stinger_connect(struct serio *serio, struct serio_driver *drv)
         stinger = kmalloc(sizeof(struct stinger), GFP_KERNEL);
         input_dev = input_allocate_device();
         if (!stinger || !input_dev)
-                goto fail;
+                goto fail1;
 
         stinger->dev = input_dev;
         snprintf(stinger->phys, sizeof(stinger->phys), "%s/serio0", serio->phys);
@@ -168,13 +168,17 @@ static int stinger_connect(struct serio *serio, struct serio_driver *drv)
 
         err = serio_open(serio, drv);
         if (err)
-                goto fail;
+                goto fail2;
+
+        err = input_register_device(stinger->dev);
+        if (err)
+                goto fail3;
 
-        input_register_device(stinger->dev);
         return 0;
 
- fail:  serio_set_drvdata(serio, NULL);
-        input_free_device(input_dev);
+ fail3: serio_close(serio);
+ fail2: serio_set_drvdata(serio, NULL);
+ fail1: input_free_device(input_dev);
         kfree(stinger);
         return err;
 }