diff options
author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-17 06:38:08 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-18 06:19:55 -0500 |
commit | 6d2e0bd60848e97756f40e49da207e862f4f3851 (patch) | |
tree | ff65aea293c7052df453c10b0b7d26e821e34651 /drivers/video/omap2 | |
parent | b3f91eb8d8d17ad3ca5da4fa9f20d2e46133fd99 (diff) |
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>
Diffstat (limited to 'drivers/video/omap2')
-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) | |||
2176 | u16 w, h; | 2176 | u16 w, h; |
2177 | #endif | 2177 | #endif |
2178 | r = def_display->enable(def_display); | 2178 | r = def_display->enable(def_display); |
2179 | if (r) | 2179 | if (r) { |
2180 | dev_warn(fbdev->dev, "Failed to enable display '%s'\n", | 2180 | dev_warn(fbdev->dev, "Failed to enable display '%s'\n", |
2181 | def_display->name); | 2181 | def_display->name); |
2182 | goto cleanup; | ||
2183 | } | ||
2182 | 2184 | ||
2183 | /* set the update mode */ | 2185 | /* set the update mode */ |
2184 | if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) { | 2186 | if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) { |