Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219906
b: refs/heads/master
c: 8522e70
h: refs/heads/master
v: v3
  • Loading branch information
Maurice Dawson authored and Greg Kroah-Hartman committed Sep 21, 2010
1 parent 5c0caef commit 9dd913c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 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: 4f10d883be0238f81c3d14aa8daa0cd8839eae1d
refs/heads/master: 8522e70b44021d1cc44de1f6c491ac21cc8f4f3d
17 changes: 10 additions & 7 deletions trunk/drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,8 @@ static int pci9111_attach(struct comedi_device *dev,
return -ENOMEM;
/* Probe the device to determine what device in the series it is. */

printk("comedi%d: " PCI9111_DRIVER_NAME " driver\n", dev->minor);
printk(KERN_ERR "comedi%d: " PCI9111_DRIVER_NAME " driver\n",
dev->minor);

for_each_pci_dev(pci_device) {
if (pci_device->vendor == PCI_VENDOR_ID_ADLINK) {
Expand Down Expand Up @@ -1325,13 +1326,14 @@ static int pci9111_attach(struct comedi_device *dev,
}
}

printk("comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, it->options[0], it->options[1]);
printk(KERN_ERR
"comedi%d: no supported board found! (req. bus/slot : %d/%d)\n",
dev->minor, it->options[0], it->options[1]);
return -EIO;

found:

printk("comedi%d: found %s (b:s:f=%d:%d:%d) , irq=%d\n",
printk(KERN_ERR "comedi%d: found %s (b:s:f=%d:%d:%d) , irq=%d\n",
dev->minor,
pci9111_boards[i].name,
pci_device->bus->number,
Expand Down Expand Up @@ -1362,7 +1364,7 @@ static int pci9111_attach(struct comedi_device *dev,
io_base = pci_resource_start(pci_device, 2);
io_range = pci_resource_len(pci_device, 2);

printk("comedi%d: 6503 registers at address 0x%4lx [0x%4lx]\n",
printk(KERN_ERR "comedi%d: 6503 registers at address 0x%4lx [0x%4lx]\n",
dev->minor, io_base, io_range);

dev->iobase = io_base;
Expand All @@ -1380,8 +1382,9 @@ static int pci9111_attach(struct comedi_device *dev,
if (pci_device->irq > 0) {
if (request_irq(pci_device->irq, pci9111_interrupt,
IRQF_SHARED, PCI9111_DRIVER_NAME, dev) != 0) {
printk("comedi%d: unable to allocate irq %u\n",
dev->minor, pci_device->irq);
printk(KERN_ERR
"comedi%d: unable to allocate irq %u\n",
dev->minor, pci_device->irq);
return -EINVAL;
}
}
Expand Down

0 comments on commit 9dd913c

Please sign in to comment.