Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364023
b: refs/heads/master
c: f70c2b6
h: refs/heads/master
i:
  364021: a67873d
  364019: 3bc6481
  364015: 59138fe
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent cb84567 commit a224f80
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 531f4fd1fbd169b6a22efe829663e8a278b88766
refs/heads/master: f70c2b6d08d2b959597bdeb22577d51396794ad0
8 changes: 3 additions & 5 deletions trunk/drivers/staging/comedi/drivers/pcl724.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,13 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iorange = PCL722_96_SIZE; /* PCL-724 in 96 DIO configuration */
printk(KERN_INFO "comedi%d: pcl724: board=%s, 0x%03lx ", dev->minor,
board->name, iobase);
if (!request_region(iobase, iorange, "pcl724")) {
if (!request_region(iobase, iorange, dev->board_name)) {
printk("I/O port conflict\n");
return -EIO;
}

dev->iobase = iobase;

dev->board_name = board->name;

#ifdef PCL724_IRQ
irq = 0;
if (board->IRQbits != 0) { /* board support IRQ */
Expand All @@ -134,8 +132,8 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it)
"DISABLING IT", irq);
irq = 0; /* Bad IRQ */
} else {
if (request_irq
(irq, interrupt_pcl724, 0, "pcl724", dev)) {
if (request_irq(irq, interrupt_pcl724, 0,
dev->board_name, dev)) {
printk(KERN_WARNING
", unable to allocate IRQ %u, "
"DISABLING IT", irq);
Expand Down

0 comments on commit a224f80

Please sign in to comment.