|
|
@@ -1263,24 +1263,25 @@ static int __init rfkill_init(void)
|
|
|
|
|
|
error = class_register(&rfkill_class);
|
|
|
if (error)
|
|
|
- goto out;
|
|
|
+ goto error_class;
|
|
|
|
|
|
error = misc_register(&rfkill_miscdev);
|
|
|
- if (error) {
|
|
|
- class_unregister(&rfkill_class);
|
|
|
- goto out;
|
|
|
- }
|
|
|
+ if (error)
|
|
|
+ goto error_misc;
|
|
|
|
|
|
#ifdef CONFIG_RFKILL_INPUT
|
|
|
error = rfkill_handler_init();
|
|
|
- if (error) {
|
|
|
- misc_deregister(&rfkill_miscdev);
|
|
|
- class_unregister(&rfkill_class);
|
|
|
- goto out;
|
|
|
- }
|
|
|
+ if (error)
|
|
|
+ goto error_input;
|
|
|
#endif
|
|
|
|
|
|
- out:
|
|
|
+ return 0;
|
|
|
+
|
|
|
+error_input:
|
|
|
+ misc_deregister(&rfkill_miscdev);
|
|
|
+error_misc:
|
|
|
+ class_unregister(&rfkill_class);
|
|
|
+error_class:
|
|
|
return error;
|
|
|
}
|
|
|
subsys_initcall(rfkill_init);
|