From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Wed, 29 Jan 2014 00:36:12 +0000 (-0200)
Subject: crypto: mxs-dcp: Check the return value of stmp_reset_block()
X-Git-Tag: v3.15-rc1~111^2~50
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fecfd7f7e91fc1e82d44b0e64a6bda8133f2037b;p=linux-2.6-block.git

crypto: mxs-dcp: Check the return value of stmp_reset_block()

stmp_reset_block() may fail, so check its return value and propagate it in the
case of error.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Marek Vasut <marex@denx.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/drivers/crypto/mxs-dcp.c b/drivers/crypto/mxs-dcp.c
index 30941d0c5803..37e070670702 100644
--- a/drivers/crypto/mxs-dcp.c
+++ b/drivers/crypto/mxs-dcp.c
@@ -949,7 +949,9 @@ static int mxs_dcp_probe(struct platform_device *pdev)
 	}
 
 	/* Restart the DCP block. */
-	stmp_reset_block(sdcp->base);
+	ret = stmp_reset_block(sdcp->base);
+	if (ret)
+		goto err_mutex;
 
 	/* Initialize control register. */
 	writel(MXS_DCP_CTRL_GATHER_RESIDUAL_WRITES |