Commit 9d8b5dba authored Mar 10, 2020 by Niklas Söderlund Committed by Greg Kroah-Hartman Oct 01, 2020

thermal: rcar_thermal: Handle probe error gracefully



[ Upstream commit 39056e8a989ef52486e063e34b4822b341e47b0e ]

If the common register memory resource is not available the driver needs
to fail gracefully to disable PM. Instead of returning the error
directly store it in ret and use the already existing error path.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200310114709.1483860-1-niklas.soderlund+renesas@ragnatech.se


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent b92d156a

drivers/thermal/rcar_thermal.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -505,8 +505,10 @@ static int rcar_thermal_probe(struct platform_device *pdev)
	res = platform_get_resource(pdev, IORESOURCE_MEM,		res = platform_get_resource(pdev, IORESOURCE_MEM,
	mres++);		mres++);
	common->base = devm_ioremap_resource(dev, res);		common->base = devm_ioremap_resource(dev, res);
	if (IS_ERR(common->base))		if (IS_ERR(common->base)) {
	return PTR_ERR(common->base);		ret = PTR_ERR(common->base);
			goto error_unregister;
			}

	idle = 0; /* polling delay is not needed */		idle = 0; /* polling delay is not needed */
	}		}