aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2017-11-15 16:00:43 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-28 10:57:18 -0500
commit811d7e0215fb738fb9a9f0bcb1276516ad161ed1 (patch)
treeb64c0d95cd9748e13ed87490031b5281f1ff5533
parent297d6b6e56c2977fc504c61bbeeaa21296923f89 (diff)
firmware: vpd: Destroy vpd sections in remove function
vpd sections are initialized during probe and thus should be destroyed in the remove function. Fixes: 049a59db34eb ("firmware: Google VPD sysfs driver") Cc: stable <stable@vger.kernel.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Tested-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/firmware/google/vpd.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
index 35e553b3b190..84217172297b 100644
--- a/drivers/firmware/google/vpd.c
+++ b/drivers/firmware/google/vpd.c
@@ -298,8 +298,17 @@ static int vpd_probe(struct platform_device *pdev)
298 return vpd_sections_init(entry.cbmem_addr); 298 return vpd_sections_init(entry.cbmem_addr);
299} 299}
300 300
301static int vpd_remove(struct platform_device *pdev)
302{
303 vpd_section_destroy(&ro_vpd);
304 vpd_section_destroy(&rw_vpd);
305
306 return 0;
307}
308
301static struct platform_driver vpd_driver = { 309static struct platform_driver vpd_driver = {
302 .probe = vpd_probe, 310 .probe = vpd_probe,
311 .remove = vpd_remove,
303 .driver = { 312 .driver = {
304 .name = "vpd", 313 .name = "vpd",
305 }, 314 },
@@ -324,8 +333,6 @@ static int __init vpd_platform_init(void)
324 333
325static void __exit vpd_platform_exit(void) 334static void __exit vpd_platform_exit(void)
326{ 335{
327 vpd_section_destroy(&ro_vpd);
328 vpd_section_destroy(&rw_vpd);
329 kobject_put(vpd_kobj); 336 kobject_put(vpd_kobj);
330} 337}
331 338