Commit 78c2ce9b authored by Aditya Pakki's avatar Aditya Pakki Committed by Bartlomiej Zolnierkiewicz
Browse files

omapfb: fix multiple reference count leaks due to pm_runtime_get_sync 



On calling pm_runtime_get_sync() the reference count of the device
is incremented. In case of failure, decrement the
reference count before returning the error.

Signed-off-by: default avatarAditya Pakki <pakki001@umn.edu>
Cc: kjlu@umn.edu
Cc: wu000273@umn.edu
Cc: Allison Randal <allison@lohutok.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Enrico Weigelt <info@metux.net>
cc: "Andrew F. Davis" <afd@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Alexios Zavras <alexios.zavras@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200614030528.128064-1-pakki001@umn.edu
parent edcb3895

drivers/video/fbdev/omap2/omapfb/dss/dispc.c

+5 −2
Original line number Diff line number Diff line
@@ -520,8 +520,11 @@ int dispc_runtime_get(void) 
	DSSDBG("dispc_runtime_get\n");



	r = pm_runtime_get_sync(&dispc.pdev->dev);

	WARN_ON(r < 0);

	return r < 0 ? r : 0;

	if (WARN_ON(r < 0)) {

		pm_runtime_put_sync(&dispc.pdev->dev);

		return r;

	}

	return 0;

}

EXPORT_SYMBOL(dispc_runtime_get);

drivers/video/fbdev/omap2/omapfb/dss/dsi.c

+5 −2
Original line number Diff line number Diff line
@@ -1137,8 +1137,11 @@ static int dsi_runtime_get(struct platform_device *dsidev) 
	DSSDBG("dsi_runtime_get\n");



	r = pm_runtime_get_sync(&dsi->pdev->dev);

	WARN_ON(r < 0);

	return r < 0 ? r : 0;

	if (WARN_ON(r < 0)) {

		pm_runtime_put_sync(&dsi->pdev->dev);

		return r;

	}

	return 0;

}



static void dsi_runtime_put(struct platform_device *dsidev)

drivers/video/fbdev/omap2/omapfb/dss/dss.c

+5 −2
Original line number Diff line number Diff line
@@ -768,8 +768,11 @@ int dss_runtime_get(void) 
	DSSDBG("dss_runtime_get\n");



	r = pm_runtime_get_sync(&dss.pdev->dev);

	WARN_ON(r < 0);

	return r < 0 ? r : 0;

	if (WARN_ON(r < 0)) {

		pm_runtime_put_sync(&dss.pdev->dev);

		return r;

	}

	return 0;

}



void dss_runtime_put(void)

drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c

+3 −2
Original line number Diff line number Diff line
@@ -39,9 +39,10 @@ static int hdmi_runtime_get(void) 
	DSSDBG("hdmi_runtime_get\n");



	r = pm_runtime_get_sync(&hdmi.pdev->dev);

	WARN_ON(r < 0);

	if (r < 0)

	if (WARN_ON(r < 0)) {

		pm_runtime_put_sync(&hdmi.pdev->dev);

		return r;

	}



	return 0;

}

drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c

+3 −2
Original line number Diff line number Diff line
@@ -43,9 +43,10 @@ static int hdmi_runtime_get(void) 
	DSSDBG("hdmi_runtime_get\n");



	r = pm_runtime_get_sync(&hdmi.pdev->dev);

	WARN_ON(r < 0);

	if (r < 0)

	if (WARN_ON(r < 0)) {

		pm_runtime_put_sync(&hdmi.pdev->dev);

		return r;

	}



	return 0;

}