Input: acecad - simplify usb_acecad_disconnect()
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 21 Apr 2010 05:20:37 +0000 (22:20 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 21 Apr 2010 05:34:15 +0000 (22:34 -0700)
There is no need to check whether acecad structure is attached to the
interface; if it isn't and we are called we have much bigger problems.
Also no need to call usb_kill_urb() in usb_acecad_disconnect() since
it is being called in usb_acecad_close().

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/tablet/acecad.c

index 265753c..1697ec2 100644 (file)
@@ -252,13 +252,11 @@ static void usb_acecad_disconnect(struct usb_interface *intf)
        struct usb_acecad *acecad = usb_get_intfdata(intf);
 
        usb_set_intfdata(intf, NULL);
-       if (acecad) {
-               usb_kill_urb(acecad->irq);
-               input_unregister_device(acecad->input);
-               usb_free_urb(acecad->irq);
-               usb_buffer_free(interface_to_usbdev(intf), 8, acecad->data, acecad->data_dma);
-               kfree(acecad);
-       }
+
+       input_unregister_device(acecad->input);
+       usb_free_urb(acecad->irq);
+       usb_buffer_free(acecad->usbdev, 8, acecad->data, acecad->data_dma);
+       kfree(acecad);
 }
 
 static struct usb_device_id usb_acecad_id_table [] = {