Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196909
b: refs/heads/master
c: cf8d3af
h: refs/heads/master
i:
  196907: 8504c7e
v: v3
  • Loading branch information
Maurice Dawson authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 9b26546 commit e3f01a6
Show file tree
Hide file tree
Showing 2 changed files with 6 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: 242467bd058f09ec05985bb09201a9cd0b1d89e5
refs/heads/master: cf8d3af5aed0d7bc40e8966b45aeced7c7bf1bef
11 changes: 5 additions & 6 deletions trunk/drivers/staging/comedi/drivers/adl_pci9118.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,9 +750,8 @@ static void interrupt_pci9118_ai_dma(struct comedi_device *dev,
comedi_event(dev, s);
return;
}

if (int_adstat & devpriv->ai_maskerr)
/* if (int_adstat & 0x106) */
/* if (int_adstat & 0x106) */
if (pci9118_decode_error_status(dev, s, int_adstat))
return;

Expand Down Expand Up @@ -2215,10 +2214,10 @@ static int pci9118_attach(struct comedi_device *dev,

if (!pcidev) {
if (opt_bus || opt_slot) {
printk(" - Card at b:s %d:%d %s\n",
printk(KERN_ERR " - Card at b:s %d:%d %s\n",
opt_bus, opt_slot, errstr);
} else {
printk(" - Card %s\n", errstr);
printk(KERN_ERR " - Card %s\n", errstr);
}
return -EIO;
}
Expand All @@ -2234,8 +2233,8 @@ static int pci9118_attach(struct comedi_device *dev,
iobase_a = pci_resource_start(pcidev, 0);
iobase_9 = pci_resource_start(pcidev, 2);

printk(", b:s:f=%d:%d:%d, io=0x%4lx, 0x%4lx", pci_bus, pci_slot,
pci_func, iobase_9, iobase_a);
printk(KERN_ERR ", b:s:f=%d:%d:%d, io=0x%4lx, 0x%4lx", pci_bus,
pci_slot, pci_func, iobase_9, iobase_a);

dev->iobase = iobase_9;
dev->board_name = this_board->name;
Expand Down

0 comments on commit e3f01a6

Please sign in to comment.