aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers.c
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2008-12-08 17:05:50 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:51 -0700
commit6a9d7a21d710e544df20266b83b7829d9f7a1020 (patch)
tree1042e21d389220b5dec6ac82575c47c0096e8aed /drivers/staging/comedi/drivers.c
parent3cd74e8693678a463b944c358cdb22f7bee533ba (diff)
Staging: comedi: Add a module parameter 'comedi_autoconfig'.
Set it to 0 or 'N' to disable autoconfiguration. It is enabled by default. From: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Cc: David Schleef <ds@schleef.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers.c')
-rw-r--r--drivers/staging/comedi/drivers.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 36a93b95e3f..5579aa0a933 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/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);