Commit dcdfe271 authored by Qinglang Miao's avatar Qinglang Miao Committed by Thierry Reding
Browse files

drm/tegra: Fix reference leak when pm_runtime_get_sync() fails 



The PM reference count is not expected to be incremented on return in
these Tegra functions.

However, pm_runtime_get_sync() will increment the PM reference count
even on failure. Forgetting to put the reference again will result in
a leak.

Replace it with pm_runtime_resume_and_get() to keep the usage counter
balanced.

Fixes: fd67e9c6 ("drm/tegra: Do not implement runtime PM")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarQinglang Miao <miaoqinglang@huawei.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 3ef170c2

drivers/gpu/drm/tegra/dc.c

+1 −1
Original line number Diff line number Diff line
@@ -2186,7 +2186,7 @@ static int tegra_dc_runtime_resume(struct host1x_client *client) 
	struct device *dev = client->dev;

	int err;



	err = pm_runtime_get_sync(dev);

	err = pm_runtime_resume_and_get(dev);

	if (err < 0) {

		dev_err(dev, "failed to get runtime PM: %d\n", err);

		return err;

drivers/gpu/drm/tegra/dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ static int tegra_dsi_runtime_resume(struct host1x_client *client) 
	struct device *dev = client->dev;

	int err;



	err = pm_runtime_get_sync(dev);

	err = pm_runtime_resume_and_get(dev);

	if (err < 0) {

		dev_err(dev, "failed to get runtime PM: %d\n", err);

		return err;

drivers/gpu/drm/tegra/hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ static int tegra_hdmi_runtime_resume(struct host1x_client *client) 
	struct device *dev = client->dev;

	int err;



	err = pm_runtime_get_sync(dev);

	err = pm_runtime_resume_and_get(dev);

	if (err < 0) {

		dev_err(dev, "failed to get runtime PM: %d\n", err);

		return err;

drivers/gpu/drm/tegra/hub.c

+1 −1
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ static int tegra_display_hub_runtime_resume(struct host1x_client *client) 
	unsigned int i;

	int err;



	err = pm_runtime_get_sync(dev);

	err = pm_runtime_resume_and_get(dev);

	if (err < 0) {

		dev_err(dev, "failed to get runtime PM: %d\n", err);

		return err;

drivers/gpu/drm/tegra/sor.c

+1 −1
Original line number Diff line number Diff line
@@ -3218,7 +3218,7 @@ static int tegra_sor_runtime_resume(struct host1x_client *client) 
	struct device *dev = client->dev;

	int err;



	err = pm_runtime_get_sync(dev);

	err = pm_runtime_resume_and_get(dev);

	if (err < 0) {

		dev_err(dev, "failed to get runtime PM: %d\n", err);

		return err;