aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-08-21 12:51:59 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-24 10:07:41 -0400
commita3c09550f0cbd9965e44a2dc62c85ff5db91f8ff (patch)
treeb4716c3c81a115f9caea36d9d95b7ce8f555703e
parent31f44d150791c3fe923399a1159320acc4a9b3b4 (diff)
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)
440 ret = PTR_ERR(clk); 440 ret = PTR_ERR(clk);
441 dev_err(&pdev->dev, 441 dev_err(&pdev->dev,
442 "can't identify CAAM ipg clk: %d\n", ret); 442 "can't identify CAAM ipg clk: %d\n", ret);
443 return -ENODEV; 443 return ret;
444 } 444 }
445 ctrlpriv->caam_ipg = clk; 445 ctrlpriv->caam_ipg = clk;
446 446
@@ -449,7 +449,7 @@ static int caam_probe(struct platform_device *pdev)
449 ret = PTR_ERR(clk); 449 ret = PTR_ERR(clk);
450 dev_err(&pdev->dev, 450 dev_err(&pdev->dev,
451 "can't identify CAAM mem clk: %d\n", ret); 451 "can't identify CAAM mem clk: %d\n", ret);
452 return -ENODEV; 452 return ret;
453 } 453 }
454 ctrlpriv->caam_mem = clk; 454 ctrlpriv->caam_mem = clk;
455 455
@@ -458,7 +458,7 @@ static int caam_probe(struct platform_device *pdev)
458 ret = PTR_ERR(clk); 458 ret = PTR_ERR(clk);
459 dev_err(&pdev->dev, 459 dev_err(&pdev->dev,
460 "can't identify CAAM aclk clk: %d\n", ret); 460 "can't identify CAAM aclk clk: %d\n", ret);
461 return -ENODEV; 461 return ret;
462 } 462 }
463 ctrlpriv->caam_aclk = clk; 463 ctrlpriv->caam_aclk = clk;
464 464
@@ -467,7 +467,7 @@ static int caam_probe(struct platform_device *pdev)
467 ret = PTR_ERR(clk); 467 ret = PTR_ERR(clk);
468 dev_err(&pdev->dev, 468 dev_err(&pdev->dev,
469 "can't identify CAAM emi_slow clk: %d\n", ret); 469 "can't identify CAAM emi_slow clk: %d\n", ret);
470 return -ENODEV; 470 return ret;
471 } 471 }
472 ctrlpriv->caam_emi_slow = clk; 472 ctrlpriv->caam_emi_slow = clk;
473 473