Commit 6124c53e authored by Michał Kępień's avatar Michał Kępień Committed by Johannes Berg
Browse files

rfkill: Cleanup error handling in rfkill_init() 



Use a separate label per error condition in rfkill_init() to make it a
bit cleaner and easier to extend.

Signed-off-by: default avatarMichał Kępień <kernel@kempniu.pl>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4a5eccaa

net/rfkill/core.c

+12 −11
Original line number Original line Diff line number Diff line
@@ -1263,24 +1263,25 @@ static int __init rfkill_init(void) 




	error = class_register(&rfkill_class);

	error = class_register(&rfkill_class);

	if (error)

	if (error)

		goto out;

		goto error_class;





	error = misc_register(&rfkill_miscdev);

	error = misc_register(&rfkill_miscdev);

	if (error) {

	if (error)

		class_unregister(&rfkill_class);

		goto error_misc;

		goto out;

	}





#ifdef CONFIG_RFKILL_INPUT

#ifdef CONFIG_RFKILL_INPUT

	error = rfkill_handler_init();

	error = rfkill_handler_init();

	if (error) {

	if (error)

		misc_deregister(&rfkill_miscdev);

		goto error_input;

		class_unregister(&rfkill_class);

		goto out;

	}

#endif

#endif





 out:

	return 0;



error_input:

	misc_deregister(&rfkill_miscdev);

error_misc:

	class_unregister(&rfkill_class);

error_class:

	return error;

	return error;

}

}

subsys_initcall(rfkill_init);

subsys_initcall(rfkill_init);