Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325152
b: refs/heads/master
c: 6be4173
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent ee40a1f commit 2437009
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 97e01bb10a193b1d8592303d8858192ee9ea32f7
refs/heads/master: 6be4173b02f85fa3d2f8610b79ea276eea86c3ac
6 changes: 0 additions & 6 deletions trunk/drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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++;

Expand Down

0 comments on commit 2437009

Please sign in to comment.