diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-20 22:06:53 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-04-20 22:34:36 -0700 |
| commit | 331cb022d3ac1f85f7842a51495c33c629e947bc (patch) | |
| tree | d913e238f074bf6f8fcdbc88cf3c02bb2f8631d3 /drivers/input | |
| parent | Input: kbtab - fix incorrect size parameter in usb_buffer_free (diff) | |
| download | linux-dev-331cb022d3ac1f85f7842a51495c33c629e947bc.tar.xz linux-dev-331cb022d3ac1f85f7842a51495c33c629e947bc.zip | |
Input: kbtab - simplify kbtab_disconnect()
There is no need to check whether kbtab 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 kbtab_disconnect() since it
is being called in kbtab_close().
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/tablet/kbtab.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c index 76b5d526cde9..3f7d1254b8ed 100644 --- a/drivers/input/tablet/kbtab.c +++ b/drivers/input/tablet/kbtab.c @@ -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), 8, 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 = { |