From: Deepak Saxena <dsaxena@plexity.net>
Date: Wed, 21 Sep 2005 16:55:35 +0000 (-0700)
Subject: [PATCH] Fix I2O config-osm init to return proper error
X-Git-Tag: v2.6.14-rc3~139
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b20f6da20d874a58becc7a08b130c4382ea7325;p=linux-2.6

[PATCH] Fix I2O config-osm init to return proper error

We currently unregister the config-osm driver if initialization of the
legacy ioctl() handlers failed but still return success.  We should be
returning -EBUSY in this case.

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/message/i2o/config-osm.c b/drivers/message/i2o/config-osm.c
index af32ab4e90..10432f6652 100644
--- a/drivers/message/i2o/config-osm.c
+++ b/drivers/message/i2o/config-osm.c
@@ -56,8 +56,11 @@ static int __init i2o_config_init(void)
 		return -EBUSY;
 	}
 #ifdef CONFIG_I2O_CONFIG_OLD_IOCTL
-	if (i2o_config_old_init())
+	if (i2o_config_old_init()) {
+		osm_err("old config handler initialization failed\n");
 		i2o_driver_unregister(&i2o_config_driver);
+		return -EBUSY;
+	}
 #endif
 
 	return 0;