1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index b7bba1790a20..9b038e4a7e71 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/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;
         }