Skip to content

Commit

Permalink
Input: kbtab - simplify kbtab_disconnect()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Torokhov committed Apr 21, 2010
1 parent ee7aa6c commit 331cb02
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions drivers/input/tablet/kbtab.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit 331cb02

Please sign in to comment.