Skip to content

Commit

Permalink
Staging: comedi: Add a module parameter 'comedi_autoconfig'.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 3cd74e8 commit 6a9d7a2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/staging/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/comedi/comedi_fops.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@

extern struct class *comedi_class;
extern const struct file_operations comedi_fops;
extern int comedi_autoconfig;

#endif /* _COMEDI_FOPS_H */
3 changes: 3 additions & 0 deletions drivers/staging/comedi/drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 6a9d7a2

Please sign in to comment.