Thread (6 messages) 6 messages, 4 authors, 2011-01-13

Re: [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error

flat view

From: Dmitry Kasatkin <hidden>
Date: 2011-01-12 14:32:40
Also in: lkml

Hi,

Indeed, thanks

On 11/01/11 17:56, Aaro Koskinen wrote:
Hi,

On Tue, 11 Jan 2011, Jamie Iles wrote:
quoted
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.

Cc: Dmitry Kasatkin <redacted>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Jamie Iles <redacted>
Reviewed-by: Aaro Koskinen <redacted>
Reviewed-by: Dmitry Kasatkin <redacted>
quoted
---
drivers/crypto/omap-aes.c |    5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 799ca51..24d0f3f 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -17,6 +17,7 @@
#include <linux/err.h>
#include <linux/module.h>
#include <linux/init.h>
+#include <linux/err.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/clk.h>
@@ -830,9 +831,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;
    }

-- 
1.7.3.4

-- 
To unsubscribe from this list: send the line "unsubscribe
linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help