From: Oliver Neukum <oliver@neukum.org>
Date: Wed, 19 Mar 2008 20:43:12 +0000 (+0200)
Subject: USB: race on disconnect in mdc800
X-Git-Tag: v2.6.16.61-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03b7f70b359bcf52ac57516d18fa0f956a5eacf7;p=thirdparty%2Fkernel%2Fstable.git

USB: race on disconnect in mdc800

I overlooked one. Setting the flag and killing the URBs must be under the lo
so that no URB is submitted after usb_kill_urb()

Adrian Bunk:
Backported to 2.6.16.

Signed-off-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---

diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index 049871145d637..067dad0aaa651 100644
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -564,11 +564,15 @@ static void mdc800_usb_disconnect (struct usb_interface *intf)
 
 		usb_deregister_dev(intf, &mdc800_class);
 
+		/* must be under lock to make sure no URB
+		   is submitted after usb_kill_urb() */
+		down (&mdc800->io_lock);
 		mdc800->state=NOT_CONNECTED;
 
 		usb_kill_urb(mdc800->irq_urb);
 		usb_kill_urb(mdc800->write_urb);
 		usb_kill_urb(mdc800->download_urb);
+		up (&mdc800->io_lock);
 
 		mdc800->dev = NULL;
 		usb_set_intfdata(intf, NULL);