aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-01-28 23:57:32 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2011-01-28 23:57:32 -0500
commit3e50191d981082345572f1e80b463eb9c05989a0 (patch)
tree8b6822d2e62065ebe5051bc494fad22421b2d7c8
parent18c0ebd2d8194cce4b3f67e2903fa01bea892cbc (diff)
crypto: omap-aes - don't treat NULL clk as an error
clk_get() returns a struct clk cookie to the driver and some platforms may return NULL if they only support a single clock. clk_get() has only failed if it returns a ERR_PTR() encoded pointer. Signed-off-by: Jamie Iles <jamie@jamieiles.com> Reviewed-and-tested-by: Tobias Karnat <tobias.karnat@googlemail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/omap-aes.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index add2a1a72ba4..5b970d9e9956 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -839,9 +839,9 @@ static int omap_aes_probe(struct platform_device *pdev)
839 839
840 /* Initializing the clock */ 840 /* Initializing the clock */
841 dd->iclk = clk_get(dev, "ick"); 841 dd->iclk = clk_get(dev, "ick");
842 if (!dd->iclk) { 842 if (IS_ERR(dd->iclk)) {
843 dev_err(dev, "clock intialization failed.\n"); 843 dev_err(dev, "clock intialization failed.\n");
844 err = -ENODEV; 844 err = PTR_ERR(dd->iclk);
845 goto err_res; 845 goto err_res;
846 } 846 }
847 847