From a58ea4c5b215b1244a0e12fd7505a9ac601bf383 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Apr 2013 16:31:07 -0700
Subject: [PATCH] --- yaml --- r: 364087 b: refs/heads/master c:
 5950ae518f0bf9affbbb4b2178c27e516e4cacc5 h: refs/heads/master i:   364085:
 e225e1bd7117b63d3cbe226bc591bf2401d090c1   364083:
 4b1f4de5cce3efcd5895bb530d3d93fdaea4d3ee   364079:
 050b4978cde4616a9fe54a50d743cc1d347a817b v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/comedi/drivers/das16m1.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0b2a6b8663bb..efe4d76870c2 100644
--- 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
index 6c4fad5b2455..77f213b4450b 100644
--- 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;
 	}