]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
firmware: vpd: Destroy vpd sections in remove function
authorGuenter Roeck <linux@roeck-us.net>
Wed, 15 Nov 2017 21:00:43 +0000 (13:00 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Nov 2017 15:57:18 +0000 (16:57 +0100)
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>
drivers/firmware/google/vpd.c

index 35e553b3b19051b45985991b9b66dc19366fc41e..84217172297b6786bce1dea1449136fb2075dceb 100644 (file)
@@ -298,8 +298,17 @@ static int vpd_probe(struct platform_device *pdev)
        return vpd_sections_init(entry.cbmem_addr);
 }
 
+static int vpd_remove(struct platform_device *pdev)
+{
+       vpd_section_destroy(&ro_vpd);
+       vpd_section_destroy(&rw_vpd);
+
+       return 0;
+}
+
 static struct platform_driver vpd_driver = {
        .probe = vpd_probe,
+       .remove = vpd_remove,
        .driver = {
                .name = "vpd",
        },
@@ -324,8 +333,6 @@ static int __init vpd_platform_init(void)
 
 static void __exit vpd_platform_exit(void)
 {
-       vpd_section_destroy(&ro_vpd);
-       vpd_section_destroy(&rw_vpd);
        kobject_put(vpd_kobj);
 }