diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-07-25 16:08:16 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-26 15:10:07 -0700 |
commit | ecc2b22990bd59b2e8ea34afa0334598cbdfad71 (patch) | |
tree | ca737493515213dc926d690ac5b671eb9264e4d1 /drivers/staging/comedi/drivers/usbdux.c | |
parent | staging: comedi: usbdux: tidy up unlink and stop helpers (diff) | |
download | linux-dev-ecc2b22990bd59b2e8ea34afa0334598cbdfad71.tar.xz linux-dev-ecc2b22990bd59b2e8ea34afa0334598cbdfad71.zip |
staging: comedi: usbdux: use the stop helpers in the detach
Use the stop helpers instead of duplicating the code in the 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/usbdux.c')
-rw-r--r-- | drivers/staging/comedi/drivers/usbdux.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c index 7077d268f883..f60674344ea8 100644 --- a/drivers/staging/comedi/drivers/usbdux.c +++ b/drivers/staging/comedi/drivers/usbdux.c @@ -1941,12 +1941,10 @@ static void usbdux_detach(struct comedi_device *dev) usb_set_intfdata(intf, NULL); - if (devpriv->pwm_cmd_running) - usbduxsub_unlink_pwm_urbs(dev); - if (devpriv->ao_cmd_running) - usbduxsub_unlink_outurbs(dev); - if (devpriv->ai_cmd_running) - usbduxsub_unlink_inurbs(dev); + /* 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); usbdux_free_usb_buffers(devpriv); |