summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-08-21 18:51:59 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-24 16:07:41 +0200
commita3c09550f0cbd9965e44a2dc62c85ff5db91f8ff (patch)
treeb4716c3c81a115f9caea36d9d95b7ce8f555703e
parentcrypto: caam - Fix the error handling in caam_probe (diff)
downloadlinux-a3c09550f0cbd9965e44a2dc62c85ff5db91f8ff.tar.xz
linux-a3c09550f0cbd9965e44a2dc62c85ff5db91f8ff.zip
crypto: caam - Propagate the real error code in caam_probe
Instead of propagating a 'fake' error code, just propagate the real one in the case of caam_drv_identify_clk() failure. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Horia Geant? <horia.geanta@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/caam/ctrl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 17102d62c707..50594bac0055 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -440,7 +440,7 @@ static int caam_probe(struct platform_device *pdev)
ret = PTR_ERR(clk);
dev_err(&pdev->dev,
"can't identify CAAM ipg clk: %d\n", ret);
- return -ENODEV;
+ return ret;
}
ctrlpriv->caam_ipg = clk;
@@ -449,7 +449,7 @@ static int caam_probe(struct platform_device *pdev)
ret = PTR_ERR(clk);
dev_err(&pdev->dev,
"can't identify CAAM mem clk: %d\n", ret);
- return -ENODEV;
+ return ret;
}
ctrlpriv->caam_mem = clk;
@@ -458,7 +458,7 @@ static int caam_probe(struct platform_device *pdev)
ret = PTR_ERR(clk);
dev_err(&pdev->dev,
"can't identify CAAM aclk clk: %d\n", ret);
- return -ENODEV;
+ return ret;
}
ctrlpriv->caam_aclk = clk;
@@ -467,7 +467,7 @@ static int caam_probe(struct platform_device *pdev)
ret = PTR_ERR(clk);
dev_err(&pdev->dev,
"can't identify CAAM emi_slow clk: %d\n", ret);
- return -ENODEV;
+ return ret;
}
ctrlpriv->caam_emi_slow = clk;