Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281365
b: refs/heads/master
c: 5cf76a8
h: refs/heads/master
i:
  281363: a3ed3e3
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Dec 14, 2011
1 parent 4e63d44 commit 874893e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 23aff74c1a7fed4019f230e6190608ce9c5d3359
refs/heads/master: 5cf76a8bf818ffc12e1a7a443eda83c9a4e13452
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/dt3000.c
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
int ret;
unsigned int mode;

printk("dt3k_ai_cmd:\n");
dev_dbg(dev->hw_dev, "dt3k_ai_cmd:\n");
for (i = 0; i < cmd->chanlist_len; i++) {
chan = CR_CHAN(cmd->chanlist[i]);
range = CR_RANGE(cmd->chanlist[i]);
Expand All @@ -652,15 +652,15 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
aref = CR_AREF(cmd->chanlist[0]);

writew(cmd->scan_end_arg, devpriv->io_addr + DPR_Params(0));
printk("param[0]=0x%04x\n", cmd->scan_end_arg);
dev_dbg(dev->hw_dev, "param[0]=0x%04x\n", cmd->scan_end_arg);

if (cmd->convert_src == TRIG_TIMER) {
divider = dt3k_ns_to_timer(50, &cmd->convert_arg,
cmd->flags & TRIG_ROUND_MASK);
writew((divider >> 16), devpriv->io_addr + DPR_Params(1));
printk("param[1]=0x%04x\n", divider >> 16);
dev_dbg(dev->hw_dev, "param[1]=0x%04x\n", divider >> 16);
writew((divider & 0xffff), devpriv->io_addr + DPR_Params(2));
printk("param[2]=0x%04x\n", divider & 0xffff);
dev_dbg(dev->hw_dev, "param[2]=0x%04x\n", divider & 0xffff);
} else {
/* not supported */
}
Expand Down

0 comments on commit 874893e

Please sign in to comment.