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: Tobias Karnat <hidden>
Date: 2011-01-13 02:25:51
Also in: lkml

Am Mittwoch, den 12.01.2011, 21:51 +0000 schrieb Jamie Iles:
Doh!  Good spot, thanks.  I've checked the rest of the series and this 
was the only patch with the duplicated include.
It can happen, thanks.

-Tobias
8<-------------------------------------------------------------------
quoted
From 75cef47f02ea19b94203f287eaaddc644c51ce30 Mon Sep 17 00:00:00 2001
From: Jamie Iles <redacted>
Date: Tue, 11 Jan 2011 09:48:26 +0000
Subject: [PATCH] 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.

Cc: Dmitry Kasatkin <redacted>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Jamie Iles <redacted>
Reviewed-and-tested-by: Tobias Karnat [off-list ref]
quoted hunk ↗ jump to hunk
---
 drivers/crypto/omap-aes.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 799ca51..10a9180 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -830,9 +830,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;
 	}
 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help