diff options
| author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-17 12:38:08 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-18 12:19:55 +0100 |
| commit | 6d2e0bd60848e97756f40e49da207e862f4f3851 (patch) | |
| tree | ff65aea293c7052df453c10b0b7d26e821e34651 | |
| parent | OMAP: DSS2: OMAPFB: fix dssdev cleanup on error (diff) | |
| download | linux-6d2e0bd60848e97756f40e49da207e862f4f3851.tar.xz linux-6d2e0bd60848e97756f40e49da207e862f4f3851.zip | |
OMAP: DSS2: OMAPFB: fix cleanup on dssdev enable error
If enabling a dss device failed, omapfb didn't exit, leading to crash.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 973bf7938086..6a383ab2bef2 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -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) { |