From: Ian Abbott <abbotti@mev.co.uk>
Date: Mon, 8 Dec 2008 17:05:50 +0000 (+0000)
Subject: Add a module parameter 'comedi_autoconfig'.  Set it to 0 or 'N' to disable
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=16fdc58d094d571b2d838e6c4ca2b095ed303148;p=comedi.git

Add a module parameter 'comedi_autoconfig'.  Set it to 0 or 'N' to disable
autoconfiguration.  It is enabled by default.
---

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index db951783..9ac73dde 100644
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -59,6 +59,9 @@ int comedi_debug;
 module_param(comedi_debug, int, 0644);
 #endif
 
+int comedi_autoconfig = 1;
+module_param(comedi_autoconfig, bool, 0444);
+
 static DEFINE_SPINLOCK(comedi_file_info_table_lock);
 static struct comedi_device_file_info* comedi_file_info_table[COMEDI_NUM_MINORS];
 
diff --git a/comedi/comedi_fops.h b/comedi/comedi_fops.h
index 08a57128..ef7c5cc3 100644
--- a/comedi/comedi_fops.h
+++ b/comedi/comedi_fops.h
@@ -4,5 +4,6 @@
 
 extern struct class *comedi_class;
 extern const struct file_operations comedi_fops;
+extern int comedi_autoconfig;
 
 #endif //_COMEDI_FOPS_H
diff --git a/comedi/drivers.c b/comedi/drivers.c
index 40195b02..b5059a82 100644
--- a/comedi/drivers.c
+++ b/comedi/drivers.c
@@ -797,6 +797,9 @@ int comedi_auto_config(struct device *hardware_device, const char *board_name, c
 	struct comedi_device_file_info *dev_file_info;
 	int retval;
 
+	if(!comedi_autoconfig)
+		return -ENODEV;
+
 	minor = comedi_alloc_board_minor(hardware_device);
 	if(minor < 0) return minor;
 	dev_set_drvdata(hardware_device, (void*)(unsigned long)minor);