---

yaml --- r: 364087 b: refs/heads/master c: 5950ae5 h: refs/heads/master i: 364085: e225e1b 364083: 4b1f4de 364079: 050b497 v: v3
git-mirror · Apr 11, 2013 · a58ea4c · a58ea4c
1 parent 6292968
commit a58ea4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 962e5a36c718678b89939a217eb527c56d9ee8a0
+refs/heads/master: 5950ae518f0bf9affbbb4b2178c27e516e4cacc5
diff --git a/trunk/drivers/staging/comedi/drivers/das16m1.c b/trunk/drivers/staging/comedi/drivers/das16m1.c
@@ -581,12 +581,11 @@ static int das16m1_attach(struct comedi_device *dev,
 	if (ret)
 		return ret;
 	/* Request an additional region for the 8255 */
-	if (!request_region(dev->iobase + DAS16M1_82C55, DAS16M1_SIZE2,
-			    dev->board_name)) {
+	ret = __comedi_request_region(dev, dev->iobase + DAS16M1_82C55,
+				      DAS16M1_SIZE2);
+	if (ret) {
 		release_region(dev->iobase, DAS16M1_SIZE);
-		dev_warn(dev->class_dev, "%s: I/O port conflict (%#lx,%d)\n",
-			 dev->board_name,
-			 dev->iobase + DAS16M1_82C55, DAS16M1_SIZE2);
+		dev->iobase = 0;
 		return -EIO;
 	}