diff options
| author | Deepak Saxena | 2005-09-21 18:55:35 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-21 19:11:54 +0200 |
| commit | 8b20f6da20d874a58becc7a08b130c4382ea7325 (patch) | |
| tree | 351214ad8719c6d46291d21b212996db46aef0dd /drivers/message/i2o | |
| parent | [PATCH] ppc64: Build zImage.vmode for G5 (diff) | |
| download | kernel-qcow2-linux-8b20f6da20d874a58becc7a08b130c4382ea7325.tar.gz kernel-qcow2-linux-8b20f6da20d874a58becc7a08b130c4382ea7325.tar.xz kernel-qcow2-linux-8b20f6da20d874a58becc7a08b130c4382ea7325.zip | |
[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>
Diffstat (limited to 'drivers/message/i2o')
| -rw-r--r-- | drivers/message/i2o/config-osm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/message/i2o/config-osm.c b/drivers/message/i2o/config-osm.c index af32ab4e90cd..10432f665201 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; |