iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: usbdux: tidy up usbdux_detach()

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2013-07-29 17:48:04 -07:00 committed by Greg Kroah-Hartman
parent 1da439008e
commit 4d9861b554
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/comedi/drivers/usbdux.c
View File

@ -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;
/* 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);
down(&devpriv->sem);
usbdux_free_usb_buffers(devpriv);
/* force unlink all urbs */
usbdux_pwm_stop(dev, 1);
usbdux_ao_stop(dev, 1);
usbdux_ai_stop(dev, 1);
up(&devpriv->sem);
}
usbdux_free_usb_buffers(devpriv);
up(&devpriv->sem);
}
static struct comedi_driver usbdux_driver = {