diff options
| author | Dave Gerlach <d-gerlach@ti.com> | 2016-09-20 18:25:40 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-11-08 18:38:27 +0300 |
| commit | 8146d19c374d341e14dbed49920a6de9118908d3 (patch) | |
| tree | 262d401231e78131d5abbd6a0f51da7976a76c37 /drivers/char | |
| parent | 83bffee1b0b05863fc29afa03b64358ee74ccc3f (diff) | |
| download | linux-8146d19c374d341e14dbed49920a6de9118908d3.tar.xz | |
hwrng: omap - Only fail if pm_runtime_get_sync returns < 0
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hw_random/omap-rng.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c index d9c1fa0e3648..b950668ddd67 100644 --- a/drivers/char/hw_random/omap-rng.c +++ b/drivers/char/hw_random/omap-rng.c @@ -387,7 +387,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; @@ -447,7 +447,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; |