diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2008-12-08 12:05:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:51 -0400 |
commit | 6a9d7a21d710e544df20266b83b7829d9f7a1020 (patch) | |
tree | 1042e21d389220b5dec6ac82575c47c0096e8aed /drivers/staging | |
parent | 3cd74e8693678a463b944c358cdb22f7bee533ba (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')
-rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 3 | ||||
-rw-r--r-- | drivers/staging/comedi/comedi_fops.h | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers.c | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 018c964396d..682e648ff3d 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c | |||
@@ -59,6 +59,9 @@ int comedi_debug; | |||
59 | module_param(comedi_debug, int, 0644); | 59 | module_param(comedi_debug, int, 0644); |
60 | #endif | 60 | #endif |
61 | 61 | ||
62 | int comedi_autoconfig = 1; | ||
63 | module_param(comedi_autoconfig, bool, 0444); | ||
64 | |||
62 | static DEFINE_SPINLOCK(comedi_file_info_table_lock); | 65 | static DEFINE_SPINLOCK(comedi_file_info_table_lock); |
63 | static struct comedi_device_file_info | 66 | static struct comedi_device_file_info |
64 | *comedi_file_info_table[COMEDI_NUM_MINORS]; | 67 | *comedi_file_info_table[COMEDI_NUM_MINORS]; |
diff --git a/drivers/staging/comedi/comedi_fops.h b/drivers/staging/comedi/comedi_fops.h index 63f8df558e8..cb503c88c7f 100644 --- a/drivers/staging/comedi/comedi_fops.h +++ b/drivers/staging/comedi/comedi_fops.h | |||
@@ -4,5 +4,6 @@ | |||
4 | 4 | ||
5 | extern struct class *comedi_class; | 5 | extern struct class *comedi_class; |
6 | extern const struct file_operations comedi_fops; | 6 | extern const struct file_operations comedi_fops; |
7 | extern int comedi_autoconfig; | ||
7 | 8 | ||
8 | #endif /* _COMEDI_FOPS_H */ | 9 | #endif /* _COMEDI_FOPS_H */ |
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 | |||
797 | struct comedi_device_file_info *dev_file_info; | 797 | struct comedi_device_file_info *dev_file_info; |
798 | int retval; | 798 | int retval; |
799 | 799 | ||
800 | if (!comedi_autoconfig) | ||
801 | return -ENODEV; | ||
802 | |||
800 | minor = comedi_alloc_board_minor(hardware_device); | 803 | minor = comedi_alloc_board_minor(hardware_device); |
801 | if(minor < 0) return minor; | 804 | if(minor < 0) return minor; |
802 | dev_set_drvdata(hardware_device, (void*)(unsigned long)minor); | 805 | dev_set_drvdata(hardware_device, (void*)(unsigned long)minor); |