diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-10-21 10:28:34 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-10-21 11:16:29 +0800 |
| commit | 6ddcb7e635ccba9f2eae4087a3039c1b5186f0e6 (patch) | |
| tree | bf89d6062feb55edb570397e0b9729c2e78117e5 /drivers/thermal | |
| parent | df8f13476443b70608c64b3e91f3876a06fa739c (diff) | |
| download | linux-6ddcb7e635ccba9f2eae4087a3039c1b5186f0e6.tar.bz2 | |
Revert "drivers: thermal: parent virtual hwmon with thermal zone"
Commit b82715fdd4a5407f56853b24d387d484dd9c3b5b introduces
a 'device' subdirectory under /sys/class/hwmon/hwmonX/ directory,
for the thermal_zone hwmon devices. And this results in different
handling by libsensors.
The problem is reported and discussed in this thread
http://marc.info/?l=linux-pm&m=138229306109596&w=2
This patch reverts commit b82715fdd4a5407f56853b24d387d484dd9c3b5b.
Reported-by: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
| -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 eeef0e2498ca..fdb07199d9c2 100644 --- a/drivers/thermal/thermal_hwmon.c +++ b/drivers/thermal/thermal_hwmon.c @@ -159,7 +159,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); - hwmon->device = hwmon_device_register(&tz->device); + hwmon->device = hwmon_device_register(NULL); if (IS_ERR(hwmon->device)) { result = PTR_ERR(hwmon->device); goto free_mem; |