Input: iforce - fix oops on device disconnect

Do not try to free iforce device when we closing input device; disconnect
is the only place where it should be deleted.

Reported-by: Johannes Ebke <johannes.ebke@physik.uni-muenchen.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

3 files changed, 12 insertions, 44 deletions

diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index f6c688cae334..acc3a9efb00f 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -210,7 +210,7 @@ static int iforce_open(struct input_dev *dev)
         return 0;
 }
 
-static void iforce_release(struct input_dev *dev)
+static void iforce_close(struct input_dev *dev)
 {
         struct iforce *iforce = input_get_drvdata(dev);
         int i;
@@ -232,26 +232,10 @@ static void iforce_release(struct input_dev *dev)
 
         switch (iforce->bus) {
 #ifdef CONFIG_JOYSTICK_IFORCE_USB
-                case IFORCE_USB:
-                        usb_kill_urb(iforce->irq);
-
-                        /* The device was unplugged before the file
-                         * was released */
-                        if (iforce->usbdev == NULL) {
-                                iforce_delete_device(iforce);
-                                kfree(iforce);
-                        }
-                break;
-#endif
-        }
-}
-
-void iforce_delete_device(struct iforce *iforce)
-{
-        switch (iforce->bus) {
-#ifdef CONFIG_JOYSTICK_IFORCE_USB
         case IFORCE_USB:
-                iforce_usb_delete(iforce);
+                usb_kill_urb(iforce->irq);
+                usb_kill_urb(iforce->out);
+                usb_kill_urb(iforce->ctrl);
                 break;
 #endif
 #ifdef CONFIG_JOYSTICK_IFORCE_232
@@ -303,7 +287,7 @@ int iforce_init_device(struct iforce *iforce)
 
         input_dev->name = "Unknown I-Force device";
         input_dev->open = iforce_open;
-        input_dev->close = iforce_release;
+        input_dev->close = iforce_close;
 
 /*
  * On-device memory allocation.
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 9f289d8f52c6..c0ad88369442 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -186,33 +186,19 @@ fail:
         return err;
 }
 
-/* Called by iforce_delete() */
-void iforce_usb_delete(struct iforce* iforce)
-{
-        usb_kill_urb(iforce->irq);
-        usb_kill_urb(iforce->out);
-        usb_kill_urb(iforce->ctrl);
-
-        usb_free_urb(iforce->irq);
-        usb_free_urb(iforce->out);
-        usb_free_urb(iforce->ctrl);
-}
-
 static void iforce_usb_disconnect(struct usb_interface *intf)
 {
         struct iforce *iforce = usb_get_intfdata(intf);
-        int open = 0; /* FIXME! iforce->dev.handle->open; */
 
         usb_set_intfdata(intf, NULL);
-        if (iforce) {
-                iforce->usbdev = NULL;
-                input_unregister_device(iforce->dev);
 
-                if (!open) {
-                        iforce_delete_device(iforce);
-                        kfree(iforce);
-                }
-        }
+        input_unregister_device(iforce->dev);
+
+        usb_free_urb(iforce->irq);
+        usb_free_urb(iforce->out);
+        usb_free_urb(iforce->ctrl);
+
+        kfree(iforce);
 }
 
 static struct usb_device_id iforce_usb_ids [] = {
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index f2d91f4028ca..9f494b75848a 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -150,11 +150,9 @@ void iforce_serial_xmit(struct iforce *iforce);
 
 /* iforce-usb.c */
 void iforce_usb_xmit(struct iforce *iforce);
-void iforce_usb_delete(struct iforce *iforce);
 
 /* iforce-main.c */
 int iforce_init_device(struct iforce *iforce);
-void iforce_delete_device(struct iforce *iforce);
 
 /* iforce-packets.c */
 int iforce_control_playback(struct iforce*, u16 id, unsigned int);