Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268812
b: refs/heads/master
c: 0bdd2b6
h: refs/heads/master
v: v3
  • Loading branch information
Nasir Abed authored and Greg Kroah-Hartman committed Oct 17, 2011
1 parent 99f446d commit 4287f04
Show file tree
Hide file tree
Showing 2 changed files with 8 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: 289ea5249c4615f21dc01e28aefce4c995f07402
refs/heads/master: 0bdd2b620794f4f8bddac620b774d7fbf879dcbc
13 changes: 7 additions & 6 deletions trunk/drivers/staging/comedi/drivers/c6xdigio.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ static int c6xdigio_pwmo_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
printk("c6xdigio_pwmo_insn_read %x\n", insn->n);
printk(KERN_DEBUG "c6xdigio_pwmo_insn_read %x\n", insn->n);
return insn->n;
}

Expand Down Expand Up @@ -439,9 +439,9 @@ static int c6xdigio_attach(struct comedi_device *dev,
struct comedi_subdevice *s;

iobase = it->options[0];
printk("comedi%d: c6xdigio: 0x%04lx\n", dev->minor, iobase);
printk(KERN_DEBUG "comedi%d: c6xdigio: 0x%04lx\n", dev->minor, iobase);
if (!request_region(iobase, C6XDIGIO_SIZE, "c6xdigio")) {
printk("comedi%d: I/O port conflict\n", dev->minor);
printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor);
return -EIO;
}
dev->iobase = iobase;
Expand All @@ -456,9 +456,10 @@ static int c6xdigio_attach(struct comedi_device *dev,

irq = it->options[1];
if (irq > 0)
printk("comedi%d: irq = %u ignored\n", dev->minor, irq);
printk(KERN_DEBUG "comedi%d: irq = %u ignored\n",
dev->minor, irq);
else if (irq == 0)
printk("comedi%d: no irq\n", dev->minor);
printk(KERN_DEBUG "comedi%d: no irq\n", dev->minor);

s = dev->subdevices + 0;
/* pwm output subdevice */
Expand Down Expand Up @@ -503,7 +504,7 @@ static int c6xdigio_detach(struct comedi_device *dev)
{
/* board_halt(dev); may not need this */

printk("comedi%d: c6xdigio: remove\n", dev->minor);
printk(KERN_DEBUG "comedi%d: c6xdigio: remove\n", dev->minor);

if (dev->iobase)
release_region(dev->iobase, C6XDIGIO_SIZE);
Expand Down

0 comments on commit 4287f04

Please sign in to comment.