summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dpi.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-11-21 12:42:58 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-12-02 07:54:54 +0100
commit33ca237f80555cde41c17682991a2b58d2f14da5 (patch)
tree7d6bf28ff53dd00bb37cfa71471d5384837ebc4d /drivers/video/omap2/dss/dpi.c
parentOMAPDSS: APPLY: add return value to dss_mgr_enable() (diff)
downloadlinux-33ca237f80555cde41c17682991a2b58d2f14da5.tar.xz
linux-33ca237f80555cde41c17682991a2b58d2f14da5.zip
OMAPDSS: check the return value of dss_mgr_enable()
Now that dss_mgr_enable returns an error value, check it in all the places dss_mgr_enable is used, and bail out properly. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
-rw-r--r--drivers/video/omap2/dss/dpi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 79c4df3c9a88..395d658a94fc 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -223,10 +223,13 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
mdelay(2);
- dss_mgr_enable(dssdev->manager);
+ r = dss_mgr_enable(dssdev->manager);
+ if (r)
+ goto err_mgr_enable;
return 0;
+err_mgr_enable:
err_set_mode:
if (dpi_use_dsi_pll(dssdev))
dsi_pll_uninit(dpi.dsidev, true);