Skip to content

Commit

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

0 comments on commit 5492f6f

Please sign in to comment.