diff --git a/[refs] b/[refs] index a96bc785c5fb..bdab8c038201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97e01bb10a193b1d8592303d8858192ee9ea32f7 +refs/heads/master: 6be4173b02f85fa3d2f8610b79ea276eea86c3ac diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index ebd819ef967e..152d682913c8 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -369,9 +369,6 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, /* step 2 : make sure trigger sources are unique and mutually * compatible */ - if (cmd->start_src != TRIG_NOW) - error++; - if ((cmd->scan_begin_src != TRIG_TIMER) && (cmd->scan_begin_src != TRIG_FOLLOW) && (cmd->scan_begin_src != TRIG_EXT)) @@ -388,9 +385,6 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, (cmd->scan_begin_src == TRIG_FOLLOW))) error++; - - if (cmd->scan_end_src != TRIG_COUNT) - error++; if ((cmd->stop_src != TRIG_COUNT) && (cmd->stop_src != TRIG_NONE)) error++;