From e523272b04c6f7cdfdfe26d846abde928e632eae Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Mon, 23 Nov 2009 08:10:50 -0800 Subject: [PATCH] --- yaml --- r: 174243 b: refs/heads/master c: 722232bcd8086b37cd3af7d9e94e7e10b231979e h: refs/heads/master i: 174241: 6b7daa07f1dce4ac56e63b25c537efefc81bcd47 174239: bc6a67cc29db6c9a7b99458c1c02284eedf0ca8b v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/usbtouchscreen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e08c829259ac..9e990ae4ff97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 985f37f827f5012f88e286914cdbae87b9f50ed1 +refs/heads/master: 722232bcd8086b37cd3af7d9e94e7e10b231979e diff --git a/trunk/drivers/input/touchscreen/usbtouchscreen.c b/trunk/drivers/input/touchscreen/usbtouchscreen.c index 68ece5801a58..eddb628c5459 100644 --- a/trunk/drivers/input/touchscreen/usbtouchscreen.c +++ b/trunk/drivers/input/touchscreen/usbtouchscreen.c @@ -1087,7 +1087,7 @@ static void usbtouch_disconnect(struct usb_interface *intf) dbg("%s - usbtouch is initialized, cleaning up", __func__); usb_set_intfdata(intf, NULL); - usb_kill_urb(usbtouch->irq); + /* this will stop IO via close */ input_unregister_device(usbtouch->input); usb_free_urb(usbtouch->irq); usbtouch_free_buffers(interface_to_usbdev(intf), usbtouch);