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

From: Tobias Karnat
Date: Wed Jan 12 2011 - 21:25:55 EST


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<-------------------------------------------------------------------
>
> >From 75cef47f02ea19b94203f287eaaddc644c51ce30 Mon Sep 17 00:00:00 2001
> From: Jamie Iles <jamie@xxxxxxxxxxxxx>
> 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 <dmitry.kasatkin@xxxxxxxxx>
> Cc: linux-crypto@xxxxxxxxxxxxxxx
> Signed-off-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
Reviewed-and-tested-by: Tobias Karnat <tobias.karnat@xxxxxxxxxxxxxx>
> ---
> 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;
> }
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/