hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sata_rcar: handle pm_runtime_get_sync failure cases 

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>
This commit is contained in:
Navid Emamdoost 2020-06-04 22:06:43 -05:00 committed by Jens Axboe
parent 6929f71e46
commit eea1238867
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/ata/sata_rcar.c
View File

@ -907,7 +907,7 @@ static int sata_rcar_probe(struct platform_device *pdev)
pm_runtime_enable(dev); pm_runtime_enable(dev);
ret = pm_runtime_get_sync(dev); ret = pm_runtime_get_sync(dev);
if (ret < 0) if (ret < 0)
goto err_pm_disable; goto err_pm_put;
host = ata_host_alloc(dev, 1); host = ata_host_alloc(dev, 1);
if (!host) { if (!host) {
@ -937,7 +937,6 @@ static int sata_rcar_probe(struct platform_device *pdev)
err_pm_put: err_pm_put:
pm_runtime_put(dev); pm_runtime_put(dev);
err_pm_disable:
pm_runtime_disable(dev); pm_runtime_disable(dev);
return ret; return ret;
} }
@ -991,8 +990,10 @@ static int sata_rcar_resume(struct device *dev)
int ret; int ret;
ret = pm_runtime_get_sync(dev); ret = pm_runtime_get_sync(dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put(dev);
return ret; return ret;
}
if (priv->type == RCAR_GEN3_SATA) { if (priv->type == RCAR_GEN3_SATA) {
sata_rcar_init_module(priv); sata_rcar_init_module(priv);
@ -1017,8 +1018,10 @@ static int sata_rcar_restore(struct device *dev)
int ret; int ret;
ret = pm_runtime_get_sync(dev); ret = pm_runtime_get_sync(dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put(dev);
return ret; return ret;
}
sata_rcar_setup_port(host); sata_rcar_setup_port(host);