From a95af55317c26bca344b00ac60be6ad09c4774ef Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 5 Feb 2013 17:18:04 -0700
Subject: [PATCH] --- yaml --- r: 354424 b: refs/heads/master c:
 9377b9234f159773a53c7277559cc24397dd9803 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/comedi/drivers/vmk80xx.c  | 49 ++++++++-----------
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index c5761a81e426..3e8f2ae3b8ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07b502f50bfc290222fe4032501619a44bbd777e
+refs/heads/master: 9377b9234f159773a53c7277559cc24397dd9803
diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
index f5a999c60763..8cd49715581a 100644
--- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c
+++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c
@@ -1214,12 +1214,26 @@ static void vmk80xx_detach(struct comedi_device *dev)
 {
 	struct vmk80xx_usb *usb = dev->private;
 
-	if (usb) {
-		down(&usb->limit_sem);
-		dev->private = NULL;
-		usb->attached = 0;
-		up(&usb->limit_sem);
-	}
+	if (!usb)
+		return;
+
+	mutex_lock(&glb_mutex);
+	down(&usb->limit_sem);
+
+	dev->private = NULL;
+
+	usb->attached = 0;
+	usb->probed = 0;
+	usb_set_intfdata(usb->intf, NULL);
+
+	usb_kill_anchored_urbs(&usb->rx_anchor);
+	usb_kill_anchored_urbs(&usb->tx_anchor);
+
+	kfree(usb->usb_rx_buf);
+	kfree(usb->usb_tx_buf);
+
+	up(&usb->limit_sem);
+	mutex_unlock(&glb_mutex);
 }
 
 static struct comedi_driver vmk80xx_driver = {
@@ -1382,30 +1396,7 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
 
 static void vmk80xx_usb_disconnect(struct usb_interface *intf)
 {
-	struct vmk80xx_usb *dev = usb_get_intfdata(intf);
-
-	if (!dev)
-		return;
-
 	comedi_usb_auto_unconfig(intf);
-
-	mutex_lock(&glb_mutex);
-	down(&dev->limit_sem);
-
-	dev->probed = 0;
-	usb_set_intfdata(dev->intf, NULL);
-
-	usb_kill_anchored_urbs(&dev->rx_anchor);
-	usb_kill_anchored_urbs(&dev->tx_anchor);
-
-	kfree(dev->usb_rx_buf);
-	kfree(dev->usb_tx_buf);
-
-	dev_info(&intf->dev, "board #%d [%s] now detached\n",
-		 dev->count, dev->board.name);
-
-	up(&dev->limit_sem);
-	mutex_unlock(&glb_mutex);
 }
 
 static const struct usb_device_id vmk80xx_usb_id_table[] = {