Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0631fb8b authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman
Browse files

firmware: vpd: Fix platform driver and device registration/unregistration 



The driver exit function needs to unregister both platform device and
driver. Also, during registration, register driver first and perform
error checks.

Fixes: 049a59db ("firmware: Google VPD sysfs driver")
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: stable <stable@vger.kernel.org>
Tested-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reviewed-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4b28b3c

drivers/firmware/google/vpd.c

+13 −5
Original line number Diff line number Diff line
@@ -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);