]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
firmware: google: Unregister driver_info on failure
authorYuan Can <yuancan@huawei.com>
Tue, 15 Oct 2024 13:13:44 +0000 (21:13 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 18:47:44 +0000 (19:47 +0100)
[ Upstream commit 32b0901e141f6d4cf49d820b53eb09b88b1f72f7 ]

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: 8942b2d5094b ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/firmware/google/gsmi.c

index 407cac71c77de9dfbf639d42a8b4cd7240628a8d..c82d38436b9b6bfa9d51d4e2ca96ef8ea01d9d15 100644 (file)
@@ -917,7 +917,8 @@ static __init int gsmi_init(void)
        gsmi_dev.pdev = platform_device_register_full(&gsmi_dev_info);
        if (IS_ERR(gsmi_dev.pdev)) {
                printk(KERN_ERR "gsmi: unable to register platform device\n");
-               return PTR_ERR(gsmi_dev.pdev);
+               ret = PTR_ERR(gsmi_dev.pdev);
+               goto out_unregister;
        }
 
        /* SMI access needs to be serialized */
@@ -1044,10 +1045,11 @@ out_err:
        gsmi_buf_free(gsmi_dev.name_buf);
        dma_pool_destroy(gsmi_dev.dma_pool);
        platform_device_unregister(gsmi_dev.pdev);
-       pr_info("gsmi: failed to load: %d\n", ret);
+out_unregister:
 #ifdef CONFIG_PM
        platform_driver_unregister(&gsmi_driver_info);
 #endif
+       pr_info("gsmi: failed to load: %d\n", ret);
        return ret;
 }