diff options
| author | Navid Emamdoost <navid.emamdoost@gmail.com> | 2020-06-05 06:06:43 +0300 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2020-07-01 06:17:13 +0300 |
| commit | 0947f6f6254c434fc57d1a3f0358bb80967ceb01 (patch) | |
| tree | 01ea4ce69c5a4270a27f842fae4d3f14d5794678 /drivers/ata | |
| parent | e852bdcce9e41c26127e4b919210e3445590a1a4 (diff) | |
| download | linux-0947f6f6254c434fc57d1a3f0358bb80967ceb01.tar.xz | |
sata_rcar: handle pm_runtime_get_sync failure cases
[ Upstream commit eea1238867205b9e48a67c1a63219529a73c46fd ]
Calling pm_runtime_get_sync increments the counter even in case of
failure, causing incorrect ref count. Call pm_runtime_put if
pm_runtime_get_sync fails.
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_rcar.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c index 03867f539f3a..50ebd779d975 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -909,7 +909,7 @@ static int sata_rcar_probe(struct platform_device *pdev) pm_runtime_enable(dev); ret = pm_runtime_get_sync(dev); if (ret < 0) - goto err_pm_disable; + goto err_pm_put; host = ata_host_alloc(dev, 1); if (!host) { @@ -940,7 +940,6 @@ static int sata_rcar_probe(struct platform_device *pdev) err_pm_put: pm_runtime_put(dev); -err_pm_disable: pm_runtime_disable(dev); return ret; } @@ -994,8 +993,10 @@ static int sata_rcar_resume(struct device *dev) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(dev); return ret; + } if (priv->type == RCAR_GEN3_SATA) { sata_rcar_init_module(priv); @@ -1020,8 +1021,10 @@ static int sata_rcar_restore(struct device *dev) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(dev); return ret; + } sata_rcar_setup_port(host); |