DigiGoon/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

firmware: google: Unregister driver_info on failure and exit in gsmi

Browse source 
[ Upstream commit c6e7af0515daca800d84b9cfa1bf19e53c4f5bc3 ]

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>
Stable-dep-of: 32b0901e141f ("firmware: google: Unregister driver_info on failure")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Arthur Heymans 2019-11-18 11:19:30 +01:00 • committed by Greg Kroah-Hartman
parent f57725bcc5
commit 659e78fe61
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/firmware/google/gsmi.c
View file

@ -1026,6 +1026,9 @@ out_err:
dma_pool_destroy(gsmi_dev.dma_pool); dma_pool_destroy(gsmi_dev.dma_pool);
platform_device_unregister(gsmi_dev.pdev); platform_device_unregister(gsmi_dev.pdev);
pr_info("gsmi: failed to load: %d\n", ret); pr_info("gsmi: failed to load: %d\n", ret);
#ifdef CONFIG_PM
platform_driver_unregister(&gsmi_driver_info);
#endif
return ret; return ret;
} }
@ -1047,6 +1050,9 @@ static void __exit gsmi_exit(void)
gsmi_buf_free(gsmi_dev.name_buf); gsmi_buf_free(gsmi_dev.name_buf);
dma_pool_destroy(gsmi_dev.dma_pool); dma_pool_destroy(gsmi_dev.dma_pool);
platform_device_unregister(gsmi_dev.pdev); platform_device_unregister(gsmi_dev.pdev);
#ifdef CONFIG_PM
platform_driver_unregister(&gsmi_driver_info);
#endif
} }
module_init(gsmi_init); module_init(gsmi_init);