Commit 24a49678 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Wolfram Sang
Browse files

i2c: tegra: Properly disable runtime PM on driver's probe error 



One of the recent Tegra I2C commits made a change that resumes runtime PM
during driver's probe, but it missed to put the RPM in a case of error.
Note that it's not correct to use pm_runtime_status_suspended because it
breaks RPM refcounting.

Fixes: 8ebf15e9 ("i2c: tegra: Move suspend handling to NOIRQ phase")
Cc: <stable@vger.kernel.org> # v5.4+
Tested-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 9f42de8d

drivers/i2c/busses/i2c-tegra.c

+19 −10
Original line number Diff line number Diff line
@@ -1608,22 +1608,26 @@ static int tegra_i2c_probe(struct platform_device *pdev) 
	}



	pm_runtime_enable(&pdev->dev);

	if (!pm_runtime_enabled(&pdev->dev))

	if (!pm_runtime_enabled(&pdev->dev)) {

		ret = tegra_i2c_runtime_resume(&pdev->dev);

	else

		ret = pm_runtime_get_sync(i2c_dev->dev);



		if (ret < 0) {

			dev_err(&pdev->dev, "runtime resume failed\n");

			goto unprepare_div_clk;

		}

	} else {

		ret = pm_runtime_get_sync(i2c_dev->dev);

		if (ret < 0) {

			dev_err(&pdev->dev, "runtime resume failed\n");

			goto disable_rpm;

		}

	}



	if (i2c_dev->is_multimaster_mode) {

		ret = clk_enable(i2c_dev->div_clk);

		if (ret < 0) {

			dev_err(i2c_dev->dev, "div_clk enable failed %d\n",

				ret);

			goto disable_rpm;

			goto put_rpm;

		}

	}
@@ -1671,10 +1675,15 @@ disable_div_clk: 
	if (i2c_dev->is_multimaster_mode)

		clk_disable(i2c_dev->div_clk);



put_rpm:

	if (pm_runtime_enabled(&pdev->dev))

		pm_runtime_put_sync(&pdev->dev);

	else

		tegra_i2c_runtime_suspend(&pdev->dev);



disable_rpm:

	if (pm_runtime_enabled(&pdev->dev))

		pm_runtime_disable(&pdev->dev);

	if (!pm_runtime_status_suspended(&pdev->dev))

		tegra_i2c_runtime_suspend(&pdev->dev);



unprepare_div_clk:

	clk_unprepare(i2c_dev->div_clk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE