From: H Hartley Sweeten Date: Tue, 9 Sep 2014 20:05:48 +0000 (-0700) Subject: staging: comedi: adl_pci9118: TRIG_INT is not a valid scan_begin_src X-Git-Tag: v3.18-rc1~130^2~522 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=abaaa7f83a505f9a6cd0405d1dc92ab19a0c7805;p=karo-tx-linux.git staging: comedi: adl_pci9118: TRIG_INT is not a valid scan_begin_src The (*do_cmdtest) validates the scan_begin_src as TRIG_FOLLOW, TRIG_TIMER, or TRIG_EXT. Remove the invalid check for TRIG_INT in the (*do_cmd). Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 86c8b66ba9eb..98922d735f00 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -1328,8 +1328,7 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) * channel manipulation without timers effect */ if (((cmd->scan_begin_src == TRIG_FOLLOW) || - (cmd->scan_begin_src == TRIG_EXT) || - (cmd->scan_begin_src == TRIG_INT)) && + (cmd->scan_begin_src == TRIG_EXT)) && (cmd->convert_src == TRIG_TIMER)) { /* both timer is used for one time */ if (cmd->scan_begin_src == TRIG_EXT)