From: Jiada Wang Date: Thu, 9 May 2019 09:09:17 +0000 (+0900) Subject: thermal: rcar_gen3_thermal: Fix to show correct trip points number X-Git-Tag: v5.4-rc1~970^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e380ea8117ce8c83c5da7063a3587a728132de0b;p=platform%2Fkernel%2Flinux-rpi.git 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 Signed-off-by: Eduardo Valentin --- diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index e6727bd..83f3062 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); }