Skip to content

Commit

Permalink
OMAP: DSS2: OMAPFB: fix cleanup on dssdev enable error
Browse files Browse the repository at this point in the history
If enabling a dss device failed, omapfb didn't exit, leading to crash.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
  • Loading branch information
Tomi Valkeinen committed Feb 18, 2010
1 parent b3f91eb commit 6d2e0bd
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/video/omap2/omapfb/omapfb-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2176,9 +2176,11 @@ static int omapfb_probe(struct platform_device *pdev)
u16 w, h;
#endif
r = def_display->enable(def_display);
if (r)
if (r) {
dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
def_display->name);
goto cleanup;
}

/* set the update mode */
if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
Expand Down

0 comments on commit 6d2e0bd

Please sign in to comment.