Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b20f6da authored by Deepak Saxena's avatar Deepak Saxena Committed by Linus Torvalds
Browse files

[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: default avatarDeepak Saxena <dsaxena@plexity.net>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40da47e1

drivers/message/i2o/config-osm.c

+4 −1
Original line number Diff line number Diff line
@@ -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;