diff options
| author |   Jiada Wang <jiada_wang@mentor.com> | 2019-05-09 18:09:17 +0900 |
|---|---|---|
| committer |   Eduardo Valentin <edubezval@gmail.com> | 2019-05-14 07:00:43 -0700 |
| commit | e380ea8117ce8c83c5da7063a3587a728132de0b (patch) | |
| tree | 2ce423cf118d67b254c987cb46fb77fee6258743 /drivers/thermal | |
| parent | thermal: rcar_thermal: update calculation formula for R-Car Gen3 SoCs (diff) | |
| download | linux-dev-e380ea8117ce8c83c5da7063a3587a728132de0b.tar.xz linux-dev-e380ea8117ce8c83c5da7063a3587a728132de0b.zip | |
thermal: rcar_gen3_thermal: Fix to show correct trip points number
Currently after store trip points number in 'ret', it is overwritten
afterwards, this cause incorrect trip point number always be shown in
the debug information after register of each thermal zone.
This patch fix this issue by moving get of trip number to
end of thermal zone registration.
Fixes: 6269e9f790e8d ("thermal: rcar_gen3_thermal: Register hwmon sysfs interface")
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/rcar_gen3_thermal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index e6727bd09f86..83f306265ee1 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -410,10 +410,6 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) } tsc->zone = zone; - ret = of_thermal_get_ntrips(tsc->zone); - if (ret < 0) - goto error_unregister; - tsc->zone->tzp->no_hwmon = false; ret = thermal_add_hwmon_sysfs(tsc->zone); if (ret) @@ -425,6 +421,10 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) goto error_unregister; } + ret = of_thermal_get_ntrips(tsc->zone); + if (ret < 0) + goto error_unregister; + dev_info(dev, "TSC%d: Loaded %d trip points\n", i, ret); } |