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

staging: comedi: usbduxsigma: use usbdux_ao_stop() to force unlink all urbs

Browse Source 
In tidy_up(), instead of duplicating the code in usbdux_ao_stop() to unlink
all the output urbs, just use usbdux_ao_stop(). Since that function calls
usb_kill_urb() for all the urbs and clears the 'ao_cmd_running' flag, we
can also remove the redundant code in tidy_up().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-05-23 12:43:35 -07:00 committed by Greg Kroah-Hartman
parent 705a8f7201
commit dc29c6fa5e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/usbduxsigma.c
View File

@ -1920,10 +1920,8 @@ static void tidy_up(struct usbduxsub *usbduxsub_tmp)
usbduxsub_tmp->urbIn = NULL; usbduxsub_tmp->urbIn = NULL;
} }
if (usbduxsub_tmp->urbOut) { if (usbduxsub_tmp->urbOut) {
if (usbduxsub_tmp->ao_cmd_running) { /* force unlink all urbs */
usbduxsub_tmp->ao_cmd_running = 0; usbdux_ao_stop(usbduxsub_tmp, 1);
usbduxsub_unlink_OutURBs(usbduxsub_tmp);
}
for (i = 0; i < usbduxsub_tmp->numOfOutBuffers; i++) { for (i = 0; i < usbduxsub_tmp->numOfOutBuffers; i++) {
if (usbduxsub_tmp->urbOut[i]->transfer_buffer) { if (usbduxsub_tmp->urbOut[i]->transfer_buffer) {
kfree(usbduxsub_tmp-> kfree(usbduxsub_tmp->
@ -1932,7 +1930,6 @@ static void tidy_up(struct usbduxsub *usbduxsub_tmp)
NULL; NULL;
} }
if (usbduxsub_tmp->urbOut[i]) { if (usbduxsub_tmp->urbOut[i]) {
usb_kill_urb(usbduxsub_tmp->urbOut[i]);
usb_free_urb(usbduxsub_tmp->urbOut[i]); usb_free_urb(usbduxsub_tmp->urbOut[i]);
usbduxsub_tmp->urbOut[i] = NULL; usbduxsub_tmp->urbOut[i] = NULL;
} }
@ -1961,7 +1958,6 @@ static void tidy_up(struct usbduxsub *usbduxsub_tmp)
usbduxsub_tmp->dac_commands = NULL; usbduxsub_tmp->dac_commands = NULL;
kfree(usbduxsub_tmp->dux_commands); kfree(usbduxsub_tmp->dux_commands);
usbduxsub_tmp->dux_commands = NULL; usbduxsub_tmp->dux_commands = NULL;
usbduxsub_tmp->ao_cmd_running = 0;
usbduxsub_tmp->pwm_cmd_running = 0; usbduxsub_tmp->pwm_cmd_running = 0;
} }