| Message ID | a548ce35-5bbc-1c61-2a52-808462000091@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | asus-wmi: Support of ASUS TUF Gaming series laptops | expand |
On Fri, Apr 19, 2019 at 1:00 PM Yurii Pavlovskyi <yurii.pavlovskyi@gmail.com> wrote: > > 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. > 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( > + &asus->platform_device->dev, "asus", asus, > + hwmon_attribute_groups); > + Temporary variable would help with readability, i.e. struct device *dev = &asus->platform_device->dev; ...
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index ee1fa93708ec..d865eb95054c 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -1425,9 +1425,10 @@ static int asus_wmi_hwmon_init(struct asus_wmi *asus) { 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( + &asus->platform_device->dev, "asus", asus, + hwmon_attribute_groups); + if (IS_ERR(hwmon)) { pr_err("Could not register asus hwmon device\n"); return PTR_ERR(hwmon);
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 <yurii.pavlovskyi@gmail.com> --- drivers/platform/x86/asus-wmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)