From bad4a99b18795a64c5ac84030d6d70bf00661256 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Apr 2013 16:21:31 -0700
Subject: [PATCH] --- yaml --- r: 364061 b: refs/heads/master c:
 a59585145f64da07ee1cfb4377deacdc2c216777 h: refs/heads/master i:   364059:
 1f16270adb8ebb2cdb436d29a5b7958137325a4e v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/staging/comedi/drivers/aio_aio12_8.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 71b2ad3ae1a6..89a43ab2cb2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 044c2e1756f3e3d5d73a7aac53d801d0242e4e56
+refs/heads/master: a59585145f64da07ee1cfb4377deacdc2c216777
diff --git a/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c b/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c
index 14cee4960911..e37d4a8f9240 100644
--- a/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c
+++ b/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c
@@ -200,15 +200,11 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
 	const struct aio12_8_boardtype *board = comedi_board(dev);
 	struct aio12_8_private *devpriv;
 	struct comedi_subdevice *s;
-	int iobase;
 	int ret;
 
-	iobase = it->options[0];
-	if (!request_region(iobase, 32, dev->board_name)) {
-		printk(KERN_ERR "I/O port conflict");
-		return -EIO;
-	}
-	dev->iobase = iobase;
+	ret = comedi_request_region(dev, it->options[0], 32);
+	if (ret)
+		return ret;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
@@ -248,8 +244,8 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
 
 	s = &dev->subdevices[2];
 	/* 8255 Digital i/o subdevice */
-	iobase = dev->iobase + AIO12_8_8255_BASE_REG;
-	ret = subdev_8255_init(dev, s, NULL, iobase);
+	ret = subdev_8255_init(dev, s, NULL,
+			       dev->iobase + AIO12_8_8255_BASE_REG);
 	if (ret)
 		return ret;