---

yaml --- r: 364086 b: refs/heads/master c: 962e5a3 h: refs/heads/master v: v3
git-mirror · Apr 11, 2013 · 6292968 · 6292968
1 parent e225e1b
commit 6292968
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: e9720fd2b8fa65e4449c1d57b114dd4f6cc0a676
+refs/heads/master: 962e5a36c718678b89939a217eb527c56d9ee8a0
diff --git a/trunk/drivers/staging/comedi/drivers/das16.c b/trunk/drivers/staging/comedi/drivers/das16.c
@@ -1120,13 +1120,10 @@ static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		if (ret)
 			return ret;
 		/* Request an additional region for the 8255 */
-		if (!request_region(dev->iobase + 0x400, board->size & 0x3ff,
-				    dev->board_name)) {
+		ret = __comedi_request_region(dev, dev->iobase + 0x400,
+					      board->size & 0x3ff);
+		if (ret) {
 			release_region(dev->iobase, 0x10);
-			dev_warn(dev->class_dev,
-				 "%s: I/O port conflict (%#lx,%d)\n",
-				 dev->board_name,
-				 dev->iobase + 0x400, board->size & 0x3ff);
 			dev->iobase = 0;
 			return -EIO;
 		}