diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-21 13:42:58 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 08:54:54 +0200 |
| commit | 33ca237f80555cde41c17682991a2b58d2f14da5 (patch) | |
| tree | 7d6bf28ff53dd00bb37cfa71471d5384837ebc4d /drivers/video/omap2/dss/dsi.c | |
| parent | 2a4ee7ee685f3bf996461ed0d148857ce85a00e2 (diff) | |
| download | op-kernel-dev-33ca237f80555cde41c17682991a2b58d2f14da5.zip op-kernel-dev-33ca237f80555cde41c17682991a2b58d2f14da5.tar.gz | |
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/dsi.c')
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 9cb2e82..4dc98b6 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -3979,6 +3979,7 @@ int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) int bpp = dsi_get_pixel_size(dssdev->panel.dsi_pix_fmt); u8 data_type; u16 word_count; + int r; if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) { switch (dssdev->panel.dsi_pix_fmt) { @@ -4013,7 +4014,15 @@ int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel) dsi_if_enable(dsidev, true); } - dss_mgr_enable(dssdev->manager); + r = dss_mgr_enable(dssdev->manager); + if (r) { + if (dssdev->panel.dsi_mode == OMAP_DSS_DSI_VIDEO_MODE) { + dsi_if_enable(dsidev, false); + dsi_vc_enable(dsidev, channel, false); + } + + return r; + } return 0; } |
