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

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

firmware: vpd: Tie firmware kobject to device lifetime 



It doesn't make sense to have /sys/firmware/vpd if the device is not
instantiated, so tie its lifetime to the device.

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

drivers/firmware/google/vpd.c

+13 −6
Original line number Diff line number Diff line
@@ -295,7 +295,17 @@ static int vpd_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	return vpd_sections_init(entry.cbmem_addr);

	vpd_kobj = kobject_create_and_add("vpd", firmware_kobj);

	if (!vpd_kobj)

		return -ENOMEM;



	ret = vpd_sections_init(entry.cbmem_addr);

	if (ret) {

		kobject_put(vpd_kobj);

		return ret;

	}



	return 0;

}



static int vpd_remove(struct platform_device *pdev)
@@ -303,6 +313,8 @@ static int vpd_remove(struct platform_device *pdev) 
	vpd_section_destroy(&ro_vpd);

	vpd_section_destroy(&rw_vpd);



	kobject_put(vpd_kobj);



	return 0;

}
@@ -322,10 +334,6 @@ static int __init vpd_platform_init(void) 
	if (IS_ERR(pdev))

		return PTR_ERR(pdev);



	vpd_kobj = kobject_create_and_add("vpd", firmware_kobj);

	if (!vpd_kobj)

		return -ENOMEM;



	platform_driver_register(&vpd_driver);



	return 0;
@@ -333,7 +341,6 @@ static int __init vpd_platform_init(void) 


static void __exit vpd_platform_exit(void)

{

	kobject_put(vpd_kobj);

}



module_init(vpd_platform_init);