Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: 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 0c32b57e

drivers/staging/comedi/drivers/usbduxsigma.c

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