From: Ian Abbott <abbotti@mev.co.uk>
Date: Tue, 9 Dec 2008 11:07:22 +0000 (+0000)
Subject: Staging: comedi: Make comedi_auto_config() succeed when auto-configuration disabled.
X-Git-Tag: v2.6.30-rc1~202^2~324
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=719548ef66175bdea228f7b377a4edc259d16ab2;p=~emulex%2Finfiniband.git

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>
---

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 7322eb8e2ba..e14aef2a197 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;