---

yaml --- r: 324644 b: refs/heads/master c: 45d6370 h: refs/heads/master v: v3
git-mirror · Sep 4, 2012 · 1fa5574 · 1fa5574
1 parent beb1252
commit 1fa5574
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3bcf099dee9b7eff642890612da1f1a13bb3255
+refs/heads/master: 45d637000d818a9061b3a52e8aa09f58719ae01e
diff --git a/trunk/drivers/staging/comedi/drivers/comedi_parport.c b/trunk/drivers/staging/comedi/drivers/comedi_parport.c
@@ -302,9 +302,11 @@ static int parport_attach(struct comedi_device *dev,
 	unsigned long iobase;
 	struct comedi_subdevice *s;
 
+	dev->board_name = dev->driver->driver_name;
+
 	iobase = it->options[0];
 	printk(KERN_INFO "comedi%d: parport: 0x%04lx ", dev->minor, iobase);
-	if (!request_region(iobase, PARPORT_SIZE, "parport (comedi)")) {
+	if (!request_region(iobase, PARPORT_SIZE, dev->board_name)) {
 		printk(KERN_ERR "I/O port conflict\n");
 		return -EIO;
 	}
@@ -313,15 +315,14 @@ static int parport_attach(struct comedi_device *dev,
 	irq = it->options[1];
 	if (irq) {
 		printk(KERN_INFO " irq=%u", irq);
-		ret = request_irq(irq, parport_interrupt, 0, "comedi_parport",
+		ret = request_irq(irq, parport_interrupt, 0, dev->board_name,
 				  dev);
 		if (ret < 0) {
 			printk(KERN_ERR " irq not available\n");
 			return -EINVAL;
 		}
 		dev->irq = irq;
 	}
-	dev->board_name = "parport";
 
 	ret = comedi_alloc_subdevices(dev, 4);
 	if (ret)