aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-07-29 17:47:44 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-31 17:44:59 -0700
commit1da439008e972ad3dfceca8a9ff4950db20f3528 (patch)
tree8d006f73f4c5721a706eb741796fab5f205cae76 /drivers/staging/comedi
parentstaging: comedi: usbduxsigma: move urb unlink into usbduxsigma_detach() (diff)
downloadlinux-dev-1da439008e972ad3dfceca8a9ff4950db20f3528.tar.xz
linux-dev-1da439008e972ad3dfceca8a9ff4950db20f3528.zip
staging: comedi: usbduxsigma: always clear the usb intfdata in (*detach)
Make sure the usb intfdata is always cleared 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>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/usbduxsigma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index 636209458a66..60815a3ec540 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -1703,11 +1703,11 @@ static void usbduxsigma_detach(struct comedi_device *dev)
struct usb_interface *intf = comedi_to_usb_interface(dev);
struct usbduxsigma_private *devpriv = dev->private;
+ usb_set_intfdata(intf, NULL);
+
if (!devpriv)
return;
- usb_set_intfdata(intf, NULL);
-
down(&devpriv->sem);
/* force unlink all urbs */