Skip to content

Commit 32b0901

Browse files
Yuan CanTzung-Bi Shih
authored andcommitted
firmware: google: Unregister driver_info on failure
When platform_device_register_full() returns error, the gsmi_init() returns without unregister gsmi_driver_info, fix by add missing platform_driver_unregister() when platform_device_register_full() failed. Fixes: 8942b2d ("gsmi: Add GSMI commands to log S0ix info") Signed-off-by: Yuan Can <yuancan@huawei.com> Acked-by: Brian Norris <briannorris@chromium.org> Link: https://lore.kernel.org/r/20241015131344.20272-1-yuancan@huawei.com Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
1 parent 67f488d commit 32b0901

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/firmware/google/gsmi.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,8 @@ static __init int gsmi_init(void)
918918
gsmi_dev.pdev = platform_device_register_full(&gsmi_dev_info);
919919
if (IS_ERR(gsmi_dev.pdev)) {
920920
printk(KERN_ERR "gsmi: unable to register platform device\n");
921-
return PTR_ERR(gsmi_dev.pdev);
921+
ret = PTR_ERR(gsmi_dev.pdev);
922+
goto out_unregister;
922923
}
923924

924925
/* SMI access needs to be serialized */
@@ -1056,10 +1057,11 @@ static __init int gsmi_init(void)
10561057
gsmi_buf_free(gsmi_dev.name_buf);
10571058
kmem_cache_destroy(gsmi_dev.mem_pool);
10581059
platform_device_unregister(gsmi_dev.pdev);
1059-
pr_info("gsmi: failed to load: %d\n", ret);
1060+
out_unregister:
10601061
#ifdef CONFIG_PM
10611062
platform_driver_unregister(&gsmi_driver_info);
10621063
#endif
1064+
pr_info("gsmi: failed to load: %d\n", ret);
10631065
return ret;
10641066
}
10651067

0 commit comments

Comments
 (0)