Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175095
b: refs/heads/master
c: c5dba43
h: refs/heads/master
i:
  175093: 64d32d7
  175091: 15cd874
  175087: 181285a
v: v3
  • Loading branch information
Klaas van Gend authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent a93af1a commit 54bbb12
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 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: 446176a7430f4dc311cda2200cd94336acbd0a6e
refs/heads/master: c5dba43b6056e83de5d95e4e17c34ad7a479aaa7
11 changes: 6 additions & 5 deletions trunk/drivers/staging/comedi/drivers/multiq3.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,19 +252,20 @@ static int multiq3_attach(struct comedi_device *dev,
struct comedi_subdevice *s;

iobase = it->options[0];
printk("comedi%d: multiq3: 0x%04lx ", dev->minor, iobase);
printk(KERN_INFO "comedi%d: multiq3: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, MULTIQ3_SIZE, "multiq3")) {
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;

irq = it->options[1];
if (irq)
printk("comedi%d: irq = %u ignored\n", dev->minor, irq);
printk(KERN_WARNING "comedi%d: irq = %u ignored\n",
dev->minor, irq);
else
printk("comedi%d: no irq\n", dev->minor);
printk(KERN_WARNING "comedi%d: no irq\n", dev->minor);
dev->board_name = "multiq3";
result = alloc_subdevices(dev, 5);
if (result < 0)
Expand Down Expand Up @@ -328,7 +329,7 @@ static int multiq3_attach(struct comedi_device *dev,

static int multiq3_detach(struct comedi_device *dev)
{
printk("comedi%d: multiq3: remove\n", dev->minor);
printk(KERN_INFO "comedi%d: multiq3: remove\n", dev->minor);

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

0 comments on commit 54bbb12

Please sign in to comment.