mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-09 11:23:09 -04:00
staging: comedi: usbduxsigma: remove check of 'probed' in (*cancel) functions
The comedi_device private data variable 'probed' is set after the usb_driver has completed its (*probe) before calling comedi_usb_auto_config(). That function calls the comedi_driver (*auto_attach) which will set the comedi_device 'private' variable and initialize the subdevices. The subdevice (*cancel) functions can only be called after the (*auto_attach) has completed successfully so the sanity checks of 'probed' are unnecessary. Remove them. 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:
committed by
Greg Kroah-Hartman
parent
05d4c6f628
commit
00fbd28514
@@ -286,10 +286,6 @@ static int usbdux_ai_cancel(struct comedi_device *dev,
|
||||
|
||||
/* prevent other CPUs from submitting new commands just now */
|
||||
down(&this_usbduxsub->sem);
|
||||
if (!(this_usbduxsub->probed)) {
|
||||
up(&this_usbduxsub->sem);
|
||||
return -ENODEV;
|
||||
}
|
||||
/* unlink only if the urb really has been submitted */
|
||||
usbdux_ai_stop(this_usbduxsub, this_usbduxsub->ai_cmd_running);
|
||||
up(&this_usbduxsub->sem);
|
||||
@@ -471,10 +467,6 @@ static int usbdux_ao_cancel(struct comedi_device *dev,
|
||||
|
||||
/* prevent other CPUs from submitting a command just now */
|
||||
down(&this_usbduxsub->sem);
|
||||
if (!(this_usbduxsub->probed)) {
|
||||
up(&this_usbduxsub->sem);
|
||||
return -ENODEV;
|
||||
}
|
||||
/* unlink only if it is really running */
|
||||
usbdux_ao_stop(this_usbduxsub, this_usbduxsub->ao_cmd_running);
|
||||
up(&this_usbduxsub->sem);
|
||||
|
||||
Reference in New Issue
Block a user