]> Pileus Git - ~andy/linux/commitdiff
staging: comedi: usbduxsigma: move usb_set_intfdata(intf, NULL) to (*detach)
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 23 May 2013 19:55:48 +0000 (12:55 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 May 2013 11:40:58 +0000 (20:40 +0900)
For aesthetic reasons, move the clearing of the interface data to
the (*detach) since its set in the (*auto_attach).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/usbduxsigma.c

index b879965565adea1e3152900182aeedf456fb649d..30ada7d8d935d7e9e572d22252bfad6b29e3b672 100644 (file)
@@ -1521,10 +1521,6 @@ static void tidy_up(struct usbduxsigma_private *usbduxsub_tmp)
 {
        int i;
 
-       /* shows the usb subsystem that the driver is down */
-       if (usbduxsub_tmp->interface)
-               usb_set_intfdata(usbduxsub_tmp->interface, NULL);
-
        if (usbduxsub_tmp->urbIn) {
                /* force unlink all urbs */
                usbdux_ai_stop(usbduxsub_tmp, 1);
@@ -1847,6 +1843,7 @@ static int usbduxsigma_auto_attach(struct comedi_device *dev,
 
 static void usbduxsigma_detach(struct comedi_device *dev)
 {
+       struct usb_interface *intf = comedi_to_usb_interface(dev);
        struct usbduxsigma_private *devpriv = dev->private;
 
        if (!devpriv)
@@ -1856,6 +1853,8 @@ static void usbduxsigma_detach(struct comedi_device *dev)
        usbdux_ai_stop(devpriv, devpriv->ai_cmd_running);
        usbdux_ao_stop(devpriv, devpriv->ao_cmd_running);
 
+       usb_set_intfdata(intf, NULL);
+
        down(&devpriv->sem);
        tidy_up(devpriv);
        up(&devpriv->sem);