From 7bcc313186b55f2e9e5a786c40b8c5c589a24d5b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 23 May 2013 12:44:17 -0700 Subject: [PATCH] staging: comedi: usbduxsigma: use usbdux_pwm_stop() to force unlink urb In tidy_up(), instead of duplicating the code in usbdux_pwm_stop() to unlink the pwm urb, just use usbdux_pwm_stop(). Since that function calls usb_kill_urb() and clears the 'pwm_cmd_running' flag, we can also remove the redundant code in tidy_up(). Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/usbduxsigma.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index 161c91274549..2c8f78b19078 100644 --- a/drivers/staging/comedi/drivers/usbduxsigma.c +++ b/drivers/staging/comedi/drivers/usbduxsigma.c @@ -1934,13 +1934,10 @@ static void tidy_up(struct usbduxsub *usbduxsub_tmp) usbduxsub_tmp->urbOut = NULL; } if (usbduxsub_tmp->urbPwm) { - if (usbduxsub_tmp->pwm_cmd_running) { - usbduxsub_tmp->pwm_cmd_running = 0; - usbduxsub_unlink_PwmURBs(usbduxsub_tmp); - } + /* force unlink urb */ + usbdux_pwm_stop(usbduxsub_tmp, 1); kfree(usbduxsub_tmp->urbPwm->transfer_buffer); usbduxsub_tmp->urbPwm->transfer_buffer = NULL; - usb_kill_urb(usbduxsub_tmp->urbPwm); usb_free_urb(usbduxsub_tmp->urbPwm); usbduxsub_tmp->urbPwm = NULL; } @@ -1954,7 +1951,6 @@ static void tidy_up(struct usbduxsub *usbduxsub_tmp) usbduxsub_tmp->dac_commands = NULL; kfree(usbduxsub_tmp->dux_commands); usbduxsub_tmp->dux_commands = NULL; - usbduxsub_tmp->pwm_cmd_running = 0; } static int usbduxsigma_attach_common(struct comedi_device *dev, -- 2.20.1