aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-01-29 15:57:32 +1100
committerHerbert Xu <herbert@gondor.apana.org.au>2011-01-29 15:57:32 +1100
commit3e50191d981082345572f1e80b463eb9c05989a0 (patch)
tree8b6822d2e62065ebe5051bc494fad22421b2d7c8
parent18c0ebd2d8194cce4b3f67e2903fa01bea892cbc (diff)
downloadkernel_samsung_smdk4412-3e50191d981082345572f1e80b463eb9c05989a0.zip
kernel_samsung_smdk4412-3e50191d981082345572f1e80b463eb9c05989a0.tar.gz
kernel_samsung_smdk4412-3e50191d981082345572f1e80b463eb9c05989a0.tar.bz2
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 add2a1a..5b970d9 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)
/* Initializing the clock */
dd->iclk = clk_get(dev, "ick");
- if (!dd->iclk) {
+ if (IS_ERR(dd->iclk)) {
dev_err(dev, "clock intialization failed.\n");
- err = -ENODEV;
+ err = PTR_ERR(dd->iclk);
goto err_res;
}