lkml.org 
[lkml]   [2017]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 188/319] hwrng: omap - Only fail if pm_runtime_get_sync returns < 0
    Date
    From: Dave Gerlach <d-gerlach@ti.com>

    commit ad8529fde9e3601180a839867a8ab041109aebb5 upstream.

    Currently omap-rng checks the return value of pm_runtime_get_sync and
    reports failure if anything is returned, however it should be checking
    if ret < 0 as pm_runtime_get_sync return 0 on success but also can return
    1 if the device was already active which is not a failure case. Only
    values < 0 are actual failures.

    Fixes: 61dc0a446e5d ("hwrng: omap - Fix assumption that runtime_get_sync will always succeed")
    Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/char/hw_random/omap-rng.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
    index 52aebbe..2798fb1 100644
    --- a/drivers/char/hw_random/omap-rng.c
    +++ b/drivers/char/hw_random/omap-rng.c
    @@ -128,7 +128,7 @@ static int omap_rng_probe(struct platform_device *pdev)

    pm_runtime_enable(&pdev->dev);
    ret = pm_runtime_get_sync(&pdev->dev);
    - if (ret) {
    + if (ret < 0) {
    dev_err(&pdev->dev, "Failed to runtime_get device: %d\n", ret);
    pm_runtime_put_noidle(&pdev->dev);
    goto err_ioremap;
    @@ -190,7 +190,7 @@ static int omap_rng_resume(struct device *dev)
    int ret;

    ret = pm_runtime_get_sync(dev);
    - if (ret) {
    + if (ret < 0) {
    dev_err(dev, "Failed to runtime_get device: %d\n", ret);
    pm_runtime_put_noidle(dev);
    return ret;
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-02-05 21:05    [W:5.198 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site