From c52d921fce9e6bc499f995f5421787cc72701697 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Apr 2013 16:10:12 -0700
Subject: [PATCH] --- yaml --- r: 364031 b: refs/heads/master c:
 ffbe031d25c7e53acce4b15bf06134a5370e7920 h: refs/heads/master i:   364029:
 eb737700745c241a6206fb0e5f3d27d0b9ded102   364027:
 ba7b34665a60c527d327269f07b9f8027d822c23   364023:
 a224f80fc3d91f6781ff6a37ed9eaebc1b1eb59c   364015:
 59138fed4eb72c7cf08ac0ab36b4ea6e26301b06   363999:
 7ada80124c13ca8131a79106fb126c322cad0ec5   363967:
 d8f99b24c0caec6f59423e797b72e5c2b07e600b   363903:
 49deb8cdabcc25d3147c1b2f35863dee4b32a32e   363775:
 369bfe9590ec41f40422aba3e34b036566225e4d   363519:
 6ef3bf2c2872fd85e054f16fa04a3a4d40e83713 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/pcl812.c | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index cd36d8e915bd..acc8b848800c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ab195e0cec942db8c28675b6e2f81f176d15eb9
+refs/heads/master: ffbe031d25c7e53acce4b15bf06134a5370e7920
diff --git a/trunk/drivers/staging/comedi/drivers/pcl812.c b/trunk/drivers/staging/comedi/drivers/pcl812.c
index 9b044644d6c4..86b29c5847fe 100644
--- a/trunk/drivers/staging/comedi/drivers/pcl812.c
+++ b/trunk/drivers/staging/comedi/drivers/pcl812.c
@@ -1122,22 +1122,15 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	const struct pcl812_board *board = comedi_board(dev);
 	struct pcl812_private *devpriv;
 	int ret, subdev;
-	unsigned long iobase;
 	unsigned int irq;
 	unsigned int dma;
 	unsigned long pages;
 	struct comedi_subdevice *s;
 	int n_subdevices;
 
-	iobase = it->options[0];
-	printk(KERN_INFO "comedi%d: pcl812:  board=%s, ioport=0x%03lx",
-	       dev->minor, board->name, iobase);
-
-	if (!request_region(iobase, board->io_range, dev->board_name)) {
-		printk("I/O port conflict\n");
-		return -EIO;
-	}
-	dev->iobase = iobase;
+	ret = comedi_request_region(dev, it->options[0], board->io_range);
+	if (ret)
+		return ret;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv) {