Input: joysticks - handle errors when registering input devices

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

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index 704bf70f1db7..6279ced8a35b 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -521,11 +521,19 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
         for (i = 0; i < 2; i++)
                 if (port->adi[i].length > 0) {
                         adi_init_center(port->adi + i);
-                        input_register_device(port->adi[i].dev);
+                        err = input_register_device(port->adi[i].dev);
+                        if (err)
+                                goto fail3;
                 }
 
         return 0;
 
+ fail3: while (--i >= 0) {
+                if (port->adi[i].length > 0) {
+                        input_unregister_device(port->adi[i].dev);
+                        port->adi[i].dev = NULL;
+                }
+        }
  fail2: for (i = 0; i < 2; i++)
                 if (port->adi[i].dev)
                         input_free_device(port->adi[i].dev);