Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317377
b: refs/heads/master
c: 31a4590
h: refs/heads/master
i:
  317375: e1d92ae
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 15, 2012
1 parent 0326c7a commit e078e8d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 28 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: f7f111c214f218483a23d40a1f8e2d798b6e130a
refs/heads/master: 31a4590ee31f2b46d28a4b85f84b04e90fa7ae00
27 changes: 0 additions & 27 deletions trunk/drivers/staging/comedi/drivers/pcl812.c
Original file line number Diff line number Diff line change
Expand Up @@ -612,33 +612,6 @@ static int pcl812_ai_cmdtest(struct comedi_device *dev,
* unique and mutually compatible
*/

if (cmd->start_src != TRIG_NOW) {
cmd->start_src = TRIG_NOW;
err++;
}

if (cmd->scan_begin_src != TRIG_FOLLOW) {
cmd->scan_begin_src = TRIG_FOLLOW;
err++;
}

if (devpriv->use_ext_trg) {
if (cmd->convert_src != TRIG_EXT) {
cmd->convert_src = TRIG_EXT;
err++;
}
} else {
if (cmd->convert_src != TRIG_TIMER) {
cmd->convert_src = TRIG_TIMER;
err++;
}
}

if (cmd->scan_end_src != TRIG_COUNT) {
cmd->scan_end_src = TRIG_COUNT;
err++;
}

if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT)
err++;

Expand Down

0 comments on commit e078e8d

Please sign in to comment.