From cf73fed1fa6200e2068868094b7b0efac8a1c06c Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Thu, 18 Apr 2013 14:31:29 -0700
Subject: [PATCH] --- yaml --- r: 364153 b: refs/heads/master c:
 316f97f169084c9a984d989d88ddce4eff60d749 h: refs/heads/master i:   364151:
 977fe27b412fba2b942c7099f608a934dfb92073 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/staging/comedi/comedidev.h |  2 ++
 trunk/drivers/staging/comedi/drivers.c   | 19 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 706832bba5c1..0d1d896f2ab5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a8d2ccdcff80c2a0aa2367cc4855c7f57e13a06
+refs/heads/master: 316f97f169084c9a984d989d88ddce4eff60d749
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
index ce509d02c214..cdd472094cee 100644
--- a/trunk/drivers/staging/comedi/comedidev.h
+++ b/trunk/drivers/staging/comedi/comedidev.h
@@ -216,6 +216,7 @@ struct comedi_device {
 
 	/* dumb */
 	unsigned long iobase;
+	unsigned long iolen;
 	unsigned int irq;
 
 	struct comedi_subdevice *read_subdev;
@@ -354,6 +355,7 @@ int __comedi_request_region(struct comedi_device *,
 			    unsigned long start, unsigned long len);
 int comedi_request_region(struct comedi_device *,
 			  unsigned long start, unsigned long len);
+void comedi_legacy_detach(struct comedi_device *);
 
 int comedi_auto_config(struct device *, struct comedi_driver *,
 		       unsigned long context);
diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c
index 2a28f64dc74c..6fecefeb51f1 100644
--- a/trunk/drivers/staging/comedi/drivers.c
+++ b/trunk/drivers/staging/comedi/drivers.c
@@ -122,6 +122,7 @@ static void cleanup_device(struct comedi_device *dev)
 	dev->board_name = NULL;
 	dev->board_ptr = NULL;
 	dev->iobase = 0;
+	dev->iolen = 0;
 	dev->ioenabled = false;
 	dev->irq = 0;
 	dev->read_subdev = NULL;
@@ -387,13 +388,29 @@ int comedi_request_region(struct comedi_device *dev,
 	int ret;
 
 	ret = __comedi_request_region(dev, start, len);
-	if (ret == 0)
+	if (ret == 0) {
 		dev->iobase = start;
+		dev->iolen = len;
+	}
 
 	return ret;
 }
 EXPORT_SYMBOL_GPL(comedi_request_region);
 
+/**
+ * comedi_legacy_detach() - A generic (*detach) function for legacy drivers.
+ * @dev: comedi_device struct
+ */
+void comedi_legacy_detach(struct comedi_device *dev)
+{
+	if (dev->iobase && dev->iolen) {
+		release_region(dev->iobase, dev->iolen);
+		dev->iobase = 0;
+		dev->iolen = 0;
+	}
+}
+EXPORT_SYMBOL_GPL(comedi_legacy_detach);
+
 int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
 	struct comedi_driver *driv;