diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-21 06:42:58 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 01:54:54 -0500 |
commit | 33ca237f80555cde41c17682991a2b58d2f14da5 (patch) | |
tree | 7d6bf28ff53dd00bb37cfa71471d5384837ebc4d /drivers/video/omap2/dss/sdi.c | |
parent | 2a4ee7ee685f3bf996461ed0d148857ce85a00e2 (diff) |
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/sdi.c')
-rw-r--r-- | drivers/video/omap2/dss/sdi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c index 02da8beb7304..8266ca0d666b 100644 --- a/drivers/video/omap2/dss/sdi.c +++ b/drivers/video/omap2/dss/sdi.c | |||
@@ -123,10 +123,14 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev) | |||
123 | goto err_sdi_enable; | 123 | goto err_sdi_enable; |
124 | mdelay(2); | 124 | mdelay(2); |
125 | 125 | ||
126 | dss_mgr_enable(dssdev->manager); | 126 | r = dss_mgr_enable(dssdev->manager); |
127 | if (r) | ||
128 | goto err_mgr_enable; | ||
127 | 129 | ||
128 | return 0; | 130 | return 0; |
129 | 131 | ||
132 | err_mgr_enable: | ||
133 | dss_sdi_disable(); | ||
130 | err_sdi_enable: | 134 | err_sdi_enable: |
131 | err_set_dispc_clock_div: | 135 | err_set_dispc_clock_div: |
132 | err_set_dss_clock_div: | 136 | err_set_dss_clock_div: |