Skip to content

Commit

Permalink
[PATCH] Fix I2O config-osm init to return proper error
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Deepak Saxena authored and Linus Torvalds committed Sep 21, 2005
1 parent 40da47e commit 8b20f6d
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/message/i2o/config-osm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8b20f6d

Please sign in to comment.