From: H Hartley Sweeten Date: Thu, 23 May 2013 19:42:42 +0000 (-0700) Subject: staging: comedi: usbduxsigma: use usbdux_ai_stop() to force unlink all urbs X-Git-Tag: firefly_0821_release~176^2~5845^2~479 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c61454e19ab327f769221f1752b59322853d8716;p=firefly-linux-kernel-4.4.55.git staging: comedi: usbduxsigma: use usbdux_ai_stop() to force unlink all urbs In tidy_up(), instead of duplicating the code in usbdux_ai_stop() to unlink all the input urbs, just use usbdux_ai_stop(). Since that function calls usb_kill_urb() for all the urbs and clears the 'ai_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 --- diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c index eca29e4d7d35..2add3efb4df1 100644 --- a/drivers/staging/comedi/drivers/usbduxsigma.c +++ b/drivers/staging/comedi/drivers/usbduxsigma.c @@ -1912,14 +1912,11 @@ static void tidy_up(struct usbduxsub *usbduxsub_tmp) usbduxsub_tmp->probed = 0; if (usbduxsub_tmp->urbIn) { - if (usbduxsub_tmp->ai_cmd_running) { - usbduxsub_tmp->ai_cmd_running = 0; - usbduxsub_unlink_InURBs(usbduxsub_tmp); - } + /* force unlink all urbs */ + usbdux_ai_stop(usbduxsub_tmp, 1); for (i = 0; i < usbduxsub_tmp->numOfInBuffers; i++) { kfree(usbduxsub_tmp->urbIn[i]->transfer_buffer); usbduxsub_tmp->urbIn[i]->transfer_buffer = NULL; - usb_kill_urb(usbduxsub_tmp->urbIn[i]); usb_free_urb(usbduxsub_tmp->urbIn[i]); usbduxsub_tmp->urbIn[i] = NULL; } @@ -1968,7 +1965,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->ai_cmd_running = 0; usbduxsub_tmp->ao_cmd_running = 0; usbduxsub_tmp->pwm_cmd_running = 0; }