]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
staging: comedi: usbduxsigma: move urb unlink into usbduxsigma_detach()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 30 Jul 2013 00:47:26 +0000 (17:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Aug 2013 00:44:59 +0000 (17:44 -0700)
For aesthetics, move the final force unlink of the urbs from
usbduxsigma_free_usb_buffers() to usbduxsigma_detach().

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>
drivers/staging/comedi/drivers/usbduxsigma.c

index 68a3cd2bb1736198e145910ea0181ba84a51d704..636209458a66d07bdc33ad52a4650d073b24c38e 100644 (file)
@@ -1621,11 +1621,6 @@ static void usbduxsigma_free_usb_buffers(struct comedi_device *dev)
        struct urb *urb;
        int i;
 
-       /* force unlink all urbs */
-       usbduxsigma_ai_stop(dev, 1);
-       usbduxsigma_ao_stop(dev, 1);
-       usbduxsigma_pwm_stop(dev, 1);
-
        urb = devpriv->pwm_urb;
        if (urb) {
                kfree(urb->transfer_buffer);
@@ -1714,7 +1709,14 @@ static void usbduxsigma_detach(struct comedi_device *dev)
        usb_set_intfdata(intf, NULL);
 
        down(&devpriv->sem);
+
+       /* force unlink all urbs */
+       usbduxsigma_ai_stop(dev, 1);
+       usbduxsigma_ao_stop(dev, 1);
+       usbduxsigma_pwm_stop(dev, 1);
+
        usbduxsigma_free_usb_buffers(dev);
+
        up(&devpriv->sem);
 }