From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 30 Jul 2013 00:48:04 +0000 (-0700)
Subject: staging: comedi: usbdux: tidy up usbdux_detach()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4d9861b554bc08e72045098dbc03d8221d904490;p=deliverable%2Flinux.git

staging: comedi: usbdux: tidy up usbdux_detach()

Make sure the usb intfdata is always cleared when the device is
detached.

Refactor the code to remove an indent level.

Always unlink the urbs when the device is detached.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 75b2de33ffd5..991c425bb837 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -1799,20 +1799,21 @@ static void usbdux_detach(struct comedi_device *dev)
 	struct usb_interface *intf = comedi_to_usb_interface(dev);
 	struct usbdux_private *devpriv = dev->private;
 
-	if (devpriv) {
-		down(&devpriv->sem);
+	usb_set_intfdata(intf, NULL);
 
-		usb_set_intfdata(intf, NULL);
+	if (!devpriv)
+		return;
+
+	down(&devpriv->sem);
 
-		/* stop and unlink any submitted urbs */
-		usbdux_pwm_stop(dev, devpriv->pwm_cmd_running);
-		usbdux_ao_stop(dev, devpriv->ao_cmd_running);
-		usbdux_ai_stop(dev, devpriv->ai_cmd_running);
+	/* force unlink all urbs */
+	usbdux_pwm_stop(dev, 1);
+	usbdux_ao_stop(dev, 1);
+	usbdux_ai_stop(dev, 1);
 
-		usbdux_free_usb_buffers(devpriv);
+	usbdux_free_usb_buffers(devpriv);
 
-		up(&devpriv->sem);
-	}
+	up(&devpriv->sem);
 }
 
 static struct comedi_driver usbdux_driver = {