lkml.org 
[lkml]   [2011]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error
    From
    Date
    Hi,

    You have included linux/err.h a second time.

    -Tobias

    Am Dienstag, den 11.01.2011, 12:43 +0000 schrieb Jamie Iles:
    > 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@nokia.com>
    > Cc: linux-crypto@vger.kernel.org
    > Signed-off-by: Jamie Iles <jamie@jamieiles.com>
    > ---
    > 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;
    > }
    >




    \
     
     \ /
      Last update: 2011-01-12 20:41    [W:0.025 / U:0.732 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site