Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281385
b: refs/heads/master
c: 89c5db0
h: refs/heads/master
i:
  281383: c79d10f
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Dec 14, 2011
1 parent 6516b4e commit 101de84
Show file tree
Hide file tree
Showing 2 changed files with 7 additions 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: cecdee85515595cbb4f586918aff076aa7dbb7be
refs/heads/master: 89c5db09627c65d5fab8b71943dd493846e25d04
12 changes: 6 additions & 6 deletions trunk/drivers/staging/comedi/drivers/contec_pci_dio.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,17 +196,17 @@ static int contec_do_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data)
{

printk("contec_do_insn_bits called\n");
printk(" data: %d %d\n", data[0], data[1]);
dev_dbg(dev->hw_dev, "contec_do_insn_bits called\n");
dev_dbg(dev->hw_dev, "data: %d %d\n", data[0], data[1]);

if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= data[0] & data[1];
printk(" out: %d on %lx\n", s->state,
dev->iobase + thisboard->out_offs);
dev_dbg(dev->hw_dev, "out: %d on %lx\n", s->state,
dev->iobase + thisboard->out_offs);
outw(s->state, dev->iobase + thisboard->out_offs);
}
return 2;
Expand All @@ -217,8 +217,8 @@ static int contec_di_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data)
{

printk("contec_di_insn_bits called\n");
printk(" data: %d %d\n", data[0], data[1]);
dev_dbg(dev->hw_dev, "contec_di_insn_bits called\n");
dev_dbg(dev->hw_dev, "data: %d %d\n", data[0], data[1]);

if (insn->n != 2)
return -EINVAL;
Expand Down

0 comments on commit 101de84

Please sign in to comment.