Staging: comedi: Make comedi_auto_config() succeed when auto-configuration disabled.
authorIan Abbott <abbotti@mev.co.uk>
Tue, 9 Dec 2008 11:07:22 +0000 (11:07 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Apr 2009 21:53:52 +0000 (14:53 -0700)
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>
drivers/staging/comedi/drivers.c

index 7322eb8e2ba9c33bcbbe673a00536bbb9c9ac20a..e14aef2a197aa40a7bbbd3c8c32034f52135b8e4 100644 (file)
@@ -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;