Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281368
b: refs/heads/master
c: deb0429
h: refs/heads/master
v: v3
  • Loading branch information
Ravishankar karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Dec 14, 2011
1 parent f45c847 commit 4a68c70
Show file tree
Hide file tree
Showing 2 changed files with 6 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: de1201ea91d0453800ec68f959297de2b37a042e
refs/heads/master: deb04291a1eaa20c4565a64e894cdeb3e311d97b
10 changes: 5 additions & 5 deletions trunk/drivers/staging/comedi/drivers/pcmuio.c
Original file line number Diff line number Diff line change
Expand Up @@ -436,14 +436,13 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irqs.. */

if (irq[0]) {
printk("irq: %u ", irq[0]);
dev_dbg(dev->hw_dev, "irq: %u\n", irq[0]);
if (irq[1] && thisboard->num_asics == 2)
printk("second ASIC irq: %u ", irq[1]);
dev_dbg(dev->hw_dev, "second ASIC irq: %u\n", irq[1]);
} else {
printk("(IRQ mode disabled) ");
dev_dbg(dev->hw_dev, "(IRQ mode disabled)\n");
}

printk("attached\n");

return 1;
}
Expand All @@ -460,7 +459,8 @@ static int pcmuio_detach(struct comedi_device *dev)
{
int i;

printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name);
dev_dbg(dev->hw_dev, "comedi%d: %s: remove\n", dev->minor,
driver.driver_name);
if (dev->iobase)
release_region(dev->iobase, ASIC_IOSIZE * thisboard->num_asics);

Expand Down

0 comments on commit 4a68c70

Please sign in to comment.