On Wed, Nov 15, 2017 at 01:00:45PM -0800, Guenter Roeck wrote:
> The driver exit function needs to unregister both platform device and
> driver. Also, during registration, register driver first and perform
> error checks.
>
> Fixes: 049a59db34eb ("firmware: Google VPD sysfs driver")
> Signed-off-by: Guenter Roeck <[email protected]>
Reviewed-by: Dmitry Torokhov <[email protected]>
> ---
> drivers/firmware/google/vpd.c | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
> index 942e358efa60..e4b40f2b4627 100644
> --- a/drivers/firmware/google/vpd.c
> +++ b/drivers/firmware/google/vpd.c
> @@ -326,21 +326,29 @@ static struct platform_driver vpd_driver = {
> },
> };
>
> +static struct platform_device *vpd_pdev;
> +
> static int __init vpd_platform_init(void)
> {
> - struct platform_device *pdev;
> + int ret;
>
> - pdev = platform_device_register_simple("vpd", -1, NULL, 0);
> - if (IS_ERR(pdev))
> - return PTR_ERR(pdev);
> + ret = platform_driver_register(&vpd_driver);
> + if (ret)
> + return ret;
>
> - platform_driver_register(&vpd_driver);
> + vpd_pdev = platform_device_register_simple("vpd", -1, NULL, 0);
> + if (IS_ERR(vpd_pdev)) {
> + platform_driver_unregister(&vpd_driver);
> + return PTR_ERR(vpd_pdev);
> + }
>
> return 0;
> }
>
> static void __exit vpd_platform_exit(void)
> {
> + platform_device_unregister(vpd_pdev);
> + platform_driver_unregister(&vpd_driver);
> }
>
> module_init(vpd_platform_init);
> --
> 2.7.4
>
--
Dmitry
