From bfcabaaa3bfb5d25c9ba0b9fbfd1d60c5a49428c Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Tue, 4 Dec 2012 15:59:55 +0000
Subject: [PATCH] --- yaml --- r: 348735 b: refs/heads/master c:
 7d3135af399e92cf4c9bbc5f86b6c140aab3b88c h: refs/heads/master i:   348733:
 4d2a3a22bd86e3d1574b7d7587b6111a69d90c84   348731:
 60f6eaf9c13bb20f4dacd1df40aae109ea03eafb   348727:
 49e52f4ab3621b4c47df3a0ee95442d497397661   348719:
 c0aa5f1515fde6b33fab33c61b4ba6447eee44f5   348703:
 326cc3ae5e657a967cf15903c1336f6bc8566f01   348671:
 a6f2f23d263ae6669df2b65f98baf56d13bce4ba v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/comedi/comedi_fops.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d361b8049444..4f5a5acf722c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34b55d8c48f4f76044d8f4d6ec3dc786cf210312
+refs/heads/master: 7d3135af399e92cf4c9bbc5f86b6c140aab3b88c
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
index b7bba1790a20..9b038e4a7e71 100644
--- a/trunk/drivers/staging/comedi/comedi_fops.c
+++ b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -1549,6 +1549,9 @@ static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
 	if (cmd == COMEDI_DEVCONFIG) {
 		rc = do_devconfig_ioctl(dev,
 					(struct comedi_devconfig __user *)arg);
+		if (rc == 0)
+			/* Evade comedi_auto_unconfig(). */
+			dev_file_info->hardware_device = NULL;
 		goto done;
 	}