[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>
This commit is contained in:
committed by
Linus Torvalds
parent
40da47e115
commit
8b20f6da20
@@ -56,8 +56,11 @@ static int __init i2o_config_init(void)
|
|||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
}
|
}
|
||||||
#ifdef CONFIG_I2O_CONFIG_OLD_IOCTL
|
#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);
|
i2o_driver_unregister(&i2o_config_driver);
|
||||||
|
return -EBUSY;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Reference in New Issue
Block a user