From: Yurii Pavlovskyi Date: Tue, 14 May 2019 18:50:30 +0000 (+0200) Subject: platform/x86: asus-wmi: Fix hwmon device cleanup X-Git-Tag: v5.3-rc1~87^2~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd10ee006ab504b2b9c5ed992cc06d3e110c6311;p=thirdparty%2Fkernel%2Flinux.git platform/x86: asus-wmi: Fix hwmon device cleanup The driver does not clean up the hwmon device on exit or error. To reproduce the bug, repeat rmmod, insmod to verify that device number /sys/devices/platform/asus-nb-wmi/hwmon/hwmon?? grows every time. Replace call for registering device with devm_* version that unregisters it automatically. Signed-off-by: Yurii Pavlovskyi Reviewed-by: Daniel Drake Signed-off-by: Andy Shevchenko --- diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 7e946ce7f66f6..6a590ec4c4ef9 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -1428,11 +1428,12 @@ __ATTRIBUTE_GROUPS(hwmon_attribute); static int asus_wmi_hwmon_init(struct asus_wmi *asus) { + struct device *dev = &asus->platform_device->dev; struct device *hwmon; - hwmon = hwmon_device_register_with_groups(&asus->platform_device->dev, - "asus", asus, - hwmon_attribute_groups); + hwmon = devm_hwmon_device_register_with_groups(dev, "asus", asus, + hwmon_attribute_groups); + if (IS_ERR(hwmon)) { pr_err("Could not register asus hwmon device\n"); return PTR_ERR(hwmon);