summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Valentin <eduardo.valentin@ti.com>2013-08-23 17:07:58 -0400
committerMyungJoo Ham <myungjoo.ham@samsung.com>2013-11-15 13:52:54 +0900
commit65d1fa232d591f1102167aad7885a31eb21aba1e (patch)
tree60df29e0336d2371509d90b70c08d8bd2c41c9ad
parent6620854a9d627297f26b6bb1f96822d2a184cc3d (diff)
downloadlinux-3.10-65d1fa232d591f1102167aad7885a31eb21aba1e.tar.gz
linux-3.10-65d1fa232d591f1102167aad7885a31eb21aba1e.tar.bz2
linux-3.10-65d1fa232d591f1102167aad7885a31eb21aba1e.zip
drivers: thermal: parent virtual hwmon with thermal zone
When creating virtual hwmon devices based out of thermal zone devices, the virtual devices won't have parents. This patch changes the code so that the parent of virtual hwmon devices is the thermal zone device that they are based of. Cc: Zhang Rui <rui.zhang@intel.com> Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
-rw-r--r--drivers/thermal/thermal_hwmon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index fdb07199d9c..eeef0e2498c 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(NULL);
+ hwmon->device = hwmon_device_register(&tz->device);
if (IS_ERR(hwmon->device)) {
result = PTR_ERR(hwmon->device);
goto free_mem;