diff --git a/[refs] b/[refs]
index 3f6c5ffe516b..bab6e15cbbc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40da47e1159b89f2df5c718d2d5e269ced72b541
+refs/heads/master: 8b20f6da20d874a58becc7a08b130c4382ea7325
diff --git a/trunk/drivers/message/i2o/config-osm.c b/trunk/drivers/message/i2o/config-osm.c
index af32ab4e90cd..10432f665201 100644
--- a/trunk/drivers/message/i2o/config-osm.c
+++ b/trunk/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;