---

yaml --- r: 364082 b: refs/heads/master c: 7ba2551 h: refs/heads/master v: v3
git-mirror · Apr 11, 2013 · c2ededb · c2ededb
1 parent 9206e62
commit c2ededb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70998b990b0489dcebd2e5b75a0e0cc3fff1065e
+refs/heads/master: 7ba25510ca88bed86e0e1e2537ae914e837afa99
diff --git a/trunk/drivers/staging/comedi/drivers/poc.c b/trunk/drivers/staging/comedi/drivers/poc.c
@@ -147,16 +147,14 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	printk(KERN_INFO "comedi%d: poc: using %s iobase 0x%lx\n", dev->minor,
 	       board->name, iobase);
 
-	dev->board_name = board->name;
-
 	if (iobase == 0) {
 		printk(KERN_ERR "io base address required\n");
 		return -EINVAL;
 	}
 
 	iosize = board->iosize;
 	/* check if io addresses are available */
-	if (!request_region(iobase, iosize, "dac02")) {
+	if (!request_region(iobase, iosize, dev->board_name)) {
 		printk(KERN_ERR "I/O port conflict: failed to allocate ports "
 			"0x%lx to 0x%lx\n", iobase, iobase + iosize - 1);
 		return -EIO;