projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ee7aa6c
)
Input: kbtab - simplify kbtab_disconnect()
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Wed, 21 Apr 2010 05:06:53 +0000
(22:06 -0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Wed, 21 Apr 2010 05:34:36 +0000
(22:34 -0700)
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>
drivers/input/tablet/kbtab.c
patch
|
blob
|
history
diff --git
a/drivers/input/tablet/kbtab.c
b/drivers/input/tablet/kbtab.c
index 76b5d526cde9a56af2c85aa1b4f3590d9cbbfdde..3f7d1254b8ed0d07e4cb6dac1dafd6bd7ebcac54 100644
(file)
--- 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 = {