]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
firmware: google: Unregister driver_info on failure and exit in gsmi
authorArthur Heymans <arthur@aheymans.xyz>
Mon, 18 Nov 2019 10:19:30 +0000 (11:19 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jan 2020 20:46:48 +0000 (21:46 +0100)
Fix a bug where the kernel module couldn't be loaded after unloading,
as the platform driver wasn't released on exit.

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Link: https://lore.kernel.org/r/20191118101934.22526-3-patrick.rudolph@9elements.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/firmware/google/gsmi.c

index edaa4e5d84ade0a65b89c8d186c0c0195b49ddfc..974c769b75cfdd84db0943092a72e0e8f8bfe4a1 100644 (file)
@@ -1016,6 +1016,9 @@ static __init int gsmi_init(void)
        dma_pool_destroy(gsmi_dev.dma_pool);
        platform_device_unregister(gsmi_dev.pdev);
        pr_info("gsmi: failed to load: %d\n", ret);
+#ifdef CONFIG_PM
+       platform_driver_unregister(&gsmi_driver_info);
+#endif
        return ret;
 }
 
@@ -1037,6 +1040,9 @@ static void __exit gsmi_exit(void)
        gsmi_buf_free(gsmi_dev.name_buf);
        dma_pool_destroy(gsmi_dev.dma_pool);
        platform_device_unregister(gsmi_dev.pdev);
+#ifdef CONFIG_PM
+       platform_driver_unregister(&gsmi_driver_info);
+#endif
 }
 
 module_init(gsmi_init);