2011-01-11 12:43:39

by Jamie Iles

Subject: [PATCH 02/16] crypto: omap-sham: 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 <[email protected]>
Cc: [email protected]
Signed-off-by: Jamie Iles <[email protected]>
---
drivers/crypto/omap-sham.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index a081c7c..1acfcd2 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -1150,9 +1150,9 @@ static int __devinit omap_sham_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 clk_err;
}

--
1.7.3.4

2011-01-11 15:58:06

by Aaro Koskinen

Subject: Re: [PATCH 02/16] crypto: omap-sham: don't treat NULL clk as an error

Hi,

On Tue, 11 Jan 2011, Jamie Iles wrote:

> 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 <[email protected]>
> Cc: [email protected]
> Signed-off-by: Jamie Iles <[email protected]>

Reviewed-by: Aaro Koskinen <[email protected]>

> ---
> drivers/crypto/omap-sham.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
> index a081c7c..1acfcd2 100644
> --- a/drivers/crypto/omap-sham.c
> +++ b/drivers/crypto/omap-sham.c
> @@ -1150,9 +1150,9 @@ static int __devinit omap_sham_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 clk_err;
> }
>
> --
> 1.7.3.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

2011-01-12 14:33:21

by Dmitry Kasatkin

Subject: Re: [PATCH 02/16] crypto: omap-sham: don't treat NULL clk as an error

Thanks.


On 11/01/11 17:56, Aaro Koskinen wrote:
> Hi,
>
> On Tue, 11 Jan 2011, Jamie Iles wrote:
>
>> 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 <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Jamie Iles <[email protected]>
>
> Reviewed-by: Aaro Koskinen <[email protected]>
>
Reviewed-by: Dmitry Kasatkin <[email protected]>
>> ---
>> drivers/crypto/omap-sham.c | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
>> index a081c7c..1acfcd2 100644
>> --- a/drivers/crypto/omap-sham.c
>> +++ b/drivers/crypto/omap-sham.c
>> @@ -1150,9 +1150,9 @@ static int __devinit omap_sham_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 clk_err;
>> }
>>
>> --
>> 1.7.3.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe
>> linux-kernel" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
>>

2011-01-29 05:02:06

by Herbert Xu

Subject: Re: [PATCH 02/16] crypto: omap-sham: don't treat NULL clk as an error

On Wed, Jan 12, 2011 at 02:32:50PM +0000, Dmitry Kasatkin wrote:
>
> >> Cc: Dmitry Kasatkin <[email protected]>
> >> Cc: [email protected]
> >> Signed-off-by: Jamie Iles <[email protected]>
> >
> > Reviewed-by: Aaro Koskinen <[email protected]>
> >
> Reviewed-by: Dmitry Kasatkin <[email protected]>

Both pathces applied.

Thanks!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt