---

yaml --- r: 364026 b: refs/heads/master c: 44a6438 h: refs/heads/master v: v3
git-mirror · Apr 11, 2013 · 0b39de2 · 0b39de2
1 parent 4e8d9ea
commit 0b39de2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9526728e0a8516b79f3c62c3a7583269f5195ccb
+refs/heads/master: 44a6438bbea4e7fcf269aca8b7de1e6b37f0b7b2
diff --git a/trunk/drivers/staging/comedi/drivers/pcl726.c b/trunk/drivers/staging/comedi/drivers/pcl726.c
@@ -236,15 +236,13 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	iorange = board->io_range;
 	printk(KERN_WARNING "comedi%d: pcl726: board=%s, 0x%03lx ", dev->minor,
 	       board->name, iobase);
-	if (!request_region(iobase, iorange, "pcl726")) {
+	if (!request_region(iobase, iorange, dev->board_name)) {
 		printk(KERN_WARNING "I/O port conflict\n");
 		return -EIO;
 	}
 
 	dev->iobase = iobase;
 
-	dev->board_name = board->name;
-
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
 		return -ENOMEM;
@@ -268,7 +266,7 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 				irq = 0;	/* Bad IRQ */
 			} else {
 				if (request_irq(irq, interrupt_pcl818, 0,
-						"pcl726", dev)) {
+						dev->board_name, dev)) {
 					printk(KERN_WARNING
 						", unable to allocate IRQ %d,"
 						" DISABLING IT", irq);