diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2008-12-09 11:07:22 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:52 -0700 |
| commit | 719548ef66175bdea228f7b377a4edc259d16ab2 (patch) | |
| tree | 7d985b535d1234fbeee4c325cfe2d53dd1974658 /drivers/staging/comedi/drivers.c | |
| parent | 6742c0af2ef2d8ff70e379ebf8a8541190ff44e6 (diff) | |
Staging: comedi: Make comedi_auto_config() succeed when auto-configuration disabled.
Otherwise it would not work properly.
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.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 7322eb8e2ba9..e14aef2a197a 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -799,8 +799,10 @@ int comedi_auto_config(struct device *hardware_device, const char *board_name, c int retval; unsigned *private_data = NULL; - if (!comedi_autoconfig) - return -ENODEV; + if (!comedi_autoconfig) { + dev_set_drvdata(hardware_device, NULL); + return 0; + } minor = comedi_alloc_board_minor(hardware_device); if(minor < 0) return minor; |