From f35f521cf5f2d1063d5878203656588787fa051e Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Tue, 20 Apr 2010 22:20:37 -0700 Subject: [PATCH] --- yaml --- r: 193525 b: refs/heads/master c: 5492f6f801c81c9663417cd8e48e759775977c83 h: refs/heads/master i: 193523: fdae6e8d4bac34cec444f16493750d1995349212 v: v3 --- [refs] | 2 +- trunk/drivers/input/tablet/acecad.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 82b14b30f2de..7fb6ffe5e883 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ef2ed597669f5e120d0c51c295f00e34b2f0801 +refs/heads/master: 5492f6f801c81c9663417cd8e48e759775977c83 diff --git a/trunk/drivers/input/tablet/acecad.c b/trunk/drivers/input/tablet/acecad.c index 265753c76304..1697ec2c308a 100644 --- a/trunk/drivers/input/tablet/acecad.c +++ b/trunk/drivers/input/tablet/acecad.c @@ -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 [] = {