diff options
| author |   Marc Zyngier <marc.zyngier@arm.com> | 2018-07-10 16:40:35 +0100 |
|---|---|---|
| committer |   Eduardo Valentin <edubezval@gmail.com> | 2018-07-27 14:43:21 -0700 |
| commit | f6b6b52ef7a54160c0a4d2b56a58f84a2e5b33c5 (patch) | |
| tree | 4b442625a41927daf53f83b2317589cb0b3840a5 /drivers/thermal/thermal_hwmon.c | |
| parent | thermal_hwmon: Sanitize attribute name passed to hwmon (diff) | |
| download | linux-dev-f6b6b52ef7a54160c0a4d2b56a58f84a2e5b33c5.tar.xz linux-dev-f6b6b52ef7a54160c0a4d2b56a58f84a2e5b33c5.zip | |
thermal_hwmon: Pass the originating device down to hwmon_device_register_with_info
When registering the hwmon device, we pass NULL as the device.
While this doesn't result in any immediate breakage, it leaves
the hwmon device at the root of the virtual devices, rather than
attached to the thermal zone hierarchy.
Instead, let's pass the actual device, which is part of the
thermal_zone_device structure. This also avoids the rather
unpleasant ""NULL device *" which can be generated by dev_{err,info}
in the hwmon subsystem.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Tested-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal/thermal_hwmon.c')
| -rw-r--r-- | drivers/thermal/thermal_hwmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c index 0bd47007c57f..40c69a533b24 100644 --- a/drivers/thermal/thermal_hwmon.c +++ b/drivers/thermal/thermal_hwmon.c @@ -143,7 +143,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) INIT_LIST_HEAD(&hwmon->tz_list); strlcpy(hwmon->type, tz->type, THERMAL_NAME_LENGTH); strreplace(hwmon->type, '-', '_'); - hwmon->device = hwmon_device_register_with_info(NULL, hwmon->type, + hwmon->device = hwmon_device_register_with_info(&tz->device, hwmon->type, hwmon, NULL, NULL); if (IS_ERR(hwmon->device)) { result = PTR_ERR(hwmon->device); |