| Message ID | 1541410354-19090-2-git-send-email-wni@nvidia.com |
|---|---|
| State | Deferred |
| Headers | show |
| Series | Fixes for Tegra soctherm | expand |
On Mon, Nov 05, 2018 at 05:32:31PM +0800, Wei Ni wrote: > Don't bail when a sensor fails to register with the > thermal zone and allow other sensors to register. > This allows other sensors to register with thermal > framework even if one sensor fails registration. > > Signed-off-by: Wei Ni <wni@nvidia.com> > --- > drivers/thermal/tegra/soctherm.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Acked-by: Thierry Reding <treding@nvidia.com>
diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c index ed28110a3535..b708300303ff 100644 --- a/drivers/thermal/tegra/soctherm.c +++ b/drivers/thermal/tegra/soctherm.c @@ -1370,9 +1370,9 @@ static int tegra_soctherm_probe(struct platform_device *pdev) &tegra_of_thermal_ops); if (IS_ERR(z)) { err = PTR_ERR(z); - dev_err(&pdev->dev, "failed to register sensor: %d\n", + dev_warn(&pdev->dev, "failed to register sensor: %d\n", err); - goto disable_clocks; + continue; } zone->tz = z; @@ -1434,6 +1434,8 @@ static int __maybe_unused soctherm_resume(struct device *dev) struct thermal_zone_device *tz; tz = tegra->thermctl_tzs[soc->ttgs[i]->id]; + if (!tz) + continue; err = tegra_soctherm_set_hwtrips(dev, soc->ttgs[i], tz); if (err) { dev_err(&pdev->dev,
Don't bail when a sensor fails to register with the thermal zone and allow other sensors to register. This allows other sensors to register with thermal framework even if one sensor fails registration. Signed-off-by: Wei Ni <wni@nvidia.com> --- drivers/thermal/tegra/soctherm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)