openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Aditya 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: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200614030528.128064-1-pakki001@umn.edu
This commit is contained in:
Aditya Pakki 2020-06-13 22:05:18 -05:00 committed by Bartlomiej Zolnierkiewicz
parent edcb3895a7
commit 78c2ce9bde
6 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/fbdev/omap2/omapfb/dss/dispc.c
View File

@ -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);

7
drivers/video/fbdev/omap2/omapfb/dss/dsi.c
View File

@ -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)

7
drivers/video/fbdev/omap2/omapfb/dss/dss.c
View File

@ -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)

5
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
View File

@ -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;
}

5
drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
View File

@ -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;
}

7
drivers/video/fbdev/omap2/omapfb/dss/venc.c
View File

@ -348,8 +348,11 @@ static int venc_runtime_get(void)
DSSDBG("venc_runtime_get\n");
r = pm_runtime_get_sync(&venc.pdev->dev);
WARN_ON(r < 0);
return r < 0 ? r : 0;
if (WARN_ON(r < 0)) {
pm_runtime_put_sync(&venc.pdev->dev);
return r;
}
return 0;
}
static void venc_runtime_put(void)