Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337311
b: refs/heads/master
c: d3bf217
h: refs/heads/master
i:
  337309: 70eb234
  337307: 42491eb
  337303: 492f5ad
  337295: 457ef99
  337279: 0bc01fe
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 26, 2012
1 parent 6c73c0e commit 5099702
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 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: f26d8b70b4ac22646388b7c58ec3d9f97d4e0f9f
refs/heads/master: d3bf2177c85f15a10c715cb0225311992503e8eb
14 changes: 2 additions & 12 deletions trunk/drivers/staging/comedi/drivers/dt3000.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,8 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
cmd->scan_begin_arg = 100 * 16 * 65535;
err++;
}
} else {
/* not supported */
}

if (cmd->convert_src == TRIG_TIMER) {
if (cmd->convert_arg < this_board->ai_speed) {
cmd->convert_arg = this_board->ai_speed;
Expand All @@ -500,8 +499,6 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
cmd->convert_arg = 50 * 16 * 65535;
err++;
}
} else {
/* not supported */
}

if (cmd->scan_end_arg != cmd->chanlist_len) {
Expand Down Expand Up @@ -532,9 +529,8 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
cmd->flags & TRIG_ROUND_MASK);
if (tmp != cmd->scan_begin_arg)
err++;
} else {
/* not supported */
}

if (cmd->convert_src == TRIG_TIMER) {
tmp = cmd->convert_arg;
dt3k_ns_to_timer(50, &cmd->convert_arg,
Expand All @@ -548,8 +544,6 @@ static int dt3k_ai_cmdtest(struct comedi_device *dev,
cmd->convert_arg * cmd->scan_end_arg;
err++;
}
} else {
/* not supported */
}

if (err)
Expand Down Expand Up @@ -585,17 +579,13 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
cmd->flags & TRIG_ROUND_MASK);
writew((divider >> 16), devpriv->io_addr + DPR_Params(1));
writew((divider & 0xffff), devpriv->io_addr + DPR_Params(2));
} else {
/* not supported */
}

if (cmd->scan_begin_src == TRIG_TIMER) {
tscandiv = dt3k_ns_to_timer(100, &cmd->scan_begin_arg,
cmd->flags & TRIG_ROUND_MASK);
writew((tscandiv >> 16), devpriv->io_addr + DPR_Params(3));
writew((tscandiv & 0xffff), devpriv->io_addr + DPR_Params(4));
} else {
/* not supported */
}

mode = DT3000_AD_RETRIG_INTERNAL | 0 | 0;
Expand Down

0 comments on commit 5099702

Please sign in to comment.