Commit c61454e1 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eac456c8

drivers/staging/comedi/drivers/usbduxsigma.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

}