From: Fabio Estevam <festevam@gmail.com>
Date: Sat, 30 May 2020 22:56:28 +0000 (-0500)
Subject: mailbox: imx: Disable the clock on devm_mbox_controller_register() failure
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=47303f9438954bc7bca593310ac8685d11297725;p=linux.git

mailbox: imx: Disable the clock on devm_mbox_controller_register() failure

devm_mbox_controller_register() may fail, and in the case of failure the
priv->clk clock that was previously enabled, should be disabled.

Fixes: 2bb7005696e2 ("mailbox: Add support for i.MX messaging unit")
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
[Jassi: fixed merge/am conflict]
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
---

diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c
index cacc60662f24c..19f8d79cebac0 100644
--- a/drivers/mailbox/imx-mailbox.c
+++ b/drivers/mailbox/imx-mailbox.c
@@ -513,8 +513,10 @@ static int imx_mu_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, priv);
 
 	ret = devm_mbox_controller_register(dev, &priv->mbox);
-	if (ret)
+	if (ret) {
+		clk_disable_unprepare(priv->clk);
 		return ret;
+	}
 
 	pm_runtime_enable(dev);