summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBui Duc Phuc <bd-phuc@jinso.co.jp>2016-08-22 03:19:49 +0000
committerZhang Rui <rui.zhang@intel.com>2016-09-27 14:02:16 +0800
commitd4b23c5c434a7af053782cc0f9eebee51ec71bb2 (patch)
tree7e6d3ab5d7c2ccea9c247852e9743545fbec78e7
parent7b5c4a0cd48dbdcdf545eff5a214b1862a398784 (diff)
downloadlinux-d4b23c5c434a7af053782cc0f9eebee51ec71bb2.tar.gz
linux-d4b23c5c434a7af053782cc0f9eebee51ec71bb2.tar.xz
thermal: rcar_thermal: don't call thermal_zone_device_unregister when USE_OF_THERMAL
devm_thermal_zone_of_sensor_register() case doesn't need to call thermal_zone_device_unregister(). Otherwise, rcar-thermal can't register thermal zone again after rebind. This patch fixes it. Signed-off-by: Bui Duc Phuc <bd-phuc@jinso.co.jp> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r--drivers/thermal/rcar_thermal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 4d07644da649..b5c6442d82d6 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -419,9 +419,10 @@ static int rcar_thermal_remove(struct platform_device *pdev)
rcar_thermal_for_each_priv(priv, common) {
rcar_thermal_irq_disable(priv);
- thermal_zone_device_unregister(priv->zone);
if (rcar_use_of_thermal(dev))
thermal_remove_hwmon_sysfs(priv->zone);
+ else
+ thermal_zone_device_unregister(priv->zone);
}
pm_runtime_put(dev);