提交 4d9861b5 编写于 作者: H H Hartley Sweeten 提交者: Greg Kroah-Hartman

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: NH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: NIan Abbott <abbotti@mev.co.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 1da43900
......@@ -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 = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册