Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0947f6f6 authored by Navid Emamdoost's avatar Navid Emamdoost Committed by Sasha Levin
Browse files

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: default avatarNavid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e852bdcc

drivers/ata/sata_rcar.c

+7 −4
Original line number Diff line number Diff line
@@ -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);