diff mbox series

[thermal:,thermal/next] thermal/drivers/rz2gl: Add error check for reset_control_deassert()

Message ID 163930803312.23020.13150282411504030063.tip-bot2@tip-bot2
State New
Headers show
Series [thermal:,thermal/next] thermal/drivers/rz2gl: Add error check for reset_control_deassert() | expand

Commit Message

thermal-bot for Lad Prabhakar Dec. 12, 2021, 11:20 a.m. UTC 
The following commit has been merged into the thermal/next branch of thermal:

Commit-ID:     8ee1c0f6526ce942b7595951c7bb0165010051c2
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//8ee1c0f6526ce942b7595951c7bb0165010051c2
Author:        Biju Das <biju.das.jz@bp.renesas.com>
AuthorDate:    Wed, 08 Dec 2021 16:40:09 
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 09 Dec 2021 15:58:09 +01:00

thermal/drivers/rz2gl: Add error check for reset_control_deassert()

If reset_control_deassert() fails, then we won't be able to access
the device registers. Therefore check the return code of
reset_control_deassert() and bail out in case of error.

While at it replace the parameter "&pdev->dev" -> "dev" in
devm_reset_control_get_exclusive().

Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20211208164010.4130-1-biju.das.jz@bp.renesas.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/thermal/rzg2l_thermal.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/drivers/thermal/rzg2l_thermal.c b/drivers/thermal/rzg2l_thermal.c
index d47d4a3..7a9cdc1 100644
--- a/drivers/thermal/rzg2l_thermal.c
+++ b/drivers/thermal/rzg2l_thermal.c
@@ -170,12 +170,14 @@  static int rzg2l_thermal_probe(struct platform_device *pdev)
 		return PTR_ERR(priv->base);
 
 	priv->dev = dev;
-	priv->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
+	priv->rstc = devm_reset_control_get_exclusive(dev, NULL);
 	if (IS_ERR(priv->rstc))
 		return dev_err_probe(dev, PTR_ERR(priv->rstc),
 				     "failed to get cpg reset");
 
-	reset_control_deassert(priv->rstc);
+	ret = reset_control_deassert(priv->rstc);
+	if (ret)
+		return dev_err_probe(dev, ret, "failed to deassert");
 
 	pm_runtime_enable(dev);
 	pm_runtime_get_sync(dev);