UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

OMAP: DSS2: OMAPFB: fix dssdev cleanup on error 

If there was a dss device without a driver and thus omapfb probe failed,
ref counts could be left to dss devices.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
This commit is contained in:
Tomi Valkeinen 2010-02-17 12:00:01 +02:00
parent c121b15244
commit b3f91eb8d8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/video/omap2/omapfb/omapfb-main.c
View File

@ -2111,18 +2111,23 @@ static int omapfb_probe(struct platform_device *pdev)
fbdev->dev = &pdev->dev; fbdev->dev = &pdev->dev;
platform_set_drvdata(pdev, fbdev); platform_set_drvdata(pdev, fbdev);
r = 0;
fbdev->num_displays = 0; fbdev->num_displays = 0;
dssdev = NULL; dssdev = NULL;
for_each_dss_dev(dssdev) { for_each_dss_dev(dssdev) {
omap_dss_get_device(dssdev); omap_dss_get_device(dssdev);
if (!dssdev->driver) { if (!dssdev->driver) {
dev_err(&pdev->dev, "no driver for display\n"); dev_err(&pdev->dev, "no driver for display\n");
r = -EINVAL; r = -ENODEV;
goto cleanup;
} }
fbdev->displays[fbdev->num_displays++] = dssdev; fbdev->displays[fbdev->num_displays++] = dssdev;
} }
if (r)
goto cleanup;
if (fbdev->num_displays == 0) { if (fbdev->num_displays == 0) {
dev_err(&pdev->dev, "no displays\n"); dev_err(&pdev->dev, "no displays\n");
r = -EINVAL; r = -EINVAL;