---

yaml --- r: 364021 b: refs/heads/master c: 814c219 h: refs/heads/master i: 364019: 3bc6481 v: v3
git-mirror · Apr 11, 2013 · a67873d · a67873d
1 parent 8c0a836
commit a67873d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f375ac5f197d32aeffe5436e5864525cc14ce44a
+refs/heads/master: 814c219a3eeb7d97046544f02b402a82917d024c
diff --git a/trunk/drivers/staging/comedi/drivers/pcl711.c b/trunk/drivers/staging/comedi/drivers/pcl711.c
@@ -459,24 +459,21 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 	iobase = it->options[0];
 	printk(KERN_INFO "comedi%d: pcl711: 0x%04lx ", dev->minor, iobase);
-	if (!request_region(iobase, PCL711_SIZE, "pcl711")) {
+	if (!request_region(iobase, PCL711_SIZE, dev->board_name)) {
 		printk("I/O port conflict\n");
 		return -EIO;
 	}
 	dev->iobase = iobase;
 
-	/* there should be a sanity check here */
-
-	dev->board_name = board->name;
-
 	/* grab our IRQ */
 	irq = it->options[1];
 	if (irq > board->maxirq) {
 		printk(KERN_ERR "irq out of range\n");
 		return -EINVAL;
 	}
 	if (irq) {
-		if (request_irq(irq, pcl711_interrupt, 0, "pcl711", dev)) {
+		if (request_irq(irq, pcl711_interrupt, 0, dev->board_name,
+			        dev)) {
 			printk(KERN_ERR "unable to allocate irq %u\n", irq);
 			return -EINVAL;
 		} else {