Input: kbtab - simplify kbtab_disconnect()

[net-next-2.6.git] / drivers / input / tablet / kbtab.c

diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
index 6682b17bf84428b14fd41e0e6c48829221c44925..3f7d1254b8ed0d07e4cb6dac1dafd6bd7ebcac54 100644 (file)
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@ -182,7 +182,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
        return 0;
 
  fail3:        usb_free_urb(kbtab->irq);
- fail2:        usb_buffer_free(dev, 10, kbtab->data, kbtab->data_dma);
+ fail2:        usb_buffer_free(dev, 8, kbtab->data, kbtab->data_dma);
  fail1:        input_free_device(input_dev);
        kfree(kbtab);
        return error;
@@ -193,13 +193,11 @@ static void kbtab_disconnect(struct usb_interface *intf)
        struct kbtab *kbtab = usb_get_intfdata(intf);
 
        usb_set_intfdata(intf, NULL);
-       if (kbtab) {
-               usb_kill_urb(kbtab->irq);
-               input_unregister_device(kbtab->dev);
-               usb_free_urb(kbtab->irq);
-               usb_buffer_free(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma);
-               kfree(kbtab);
-       }
+
+       input_unregister_device(kbtab->dev);
+       usb_free_urb(kbtab->irq);
+       usb_buffer_free(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
+       kfree(kbtab);
 }
 
 static struct usb_driver kbtab_driver = {