1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 35edea1ab955..1e4828b9a1ab 100644
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -149,7 +149,7 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
         warrior = kzalloc(sizeof(struct warrior), GFP_KERNEL);
         input_dev = input_allocate_device();
         if (!warrior || !input_dev)
-                goto fail;
+                goto fail1;
 
         warrior->dev = input_dev;
         snprintf(warrior->phys, sizeof(warrior->phys), "%s/input0", serio->phys);
@@ -176,13 +176,17 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv)
 
         err = serio_open(serio, drv);
         if (err)
-                goto fail;
+                goto fail2;
+
+        err = input_register_device(warrior->dev);
+        if (err)
+                goto fail3;
 
-        input_register_device(warrior->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(warrior);
         return err;
 }