diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2010-10-28 13:46:38 (GMT) |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-05-11 11:19:25 (GMT) |
| commit | 14572c6356dc4361231ee8f4402468c1f36d2c34 (patch) | |
| tree | 88158bc7225b217df86a260a56ede8845405867f /drivers/video | |
| parent | bcd8e374b5d39d481d00936e183b0ded99a5f31a (diff) | |
| download | linux-fsl-qoriq-14572c6356dc4361231ee8f4402468c1f36d2c34.tar.xz | |
OMAP: DSS2: VENC: Add missing start/stop_device calls
VENC code was missing omap_dss_start/stop_device calls. This didn't
cause any problems as VENC could not be compiled as a module, but
nevertheless it's better to add the calls.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 9831726..980f919 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -476,6 +476,12 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) mutex_lock(&venc.venc_lock); + r = omap_dss_start_device(dssdev); + if (r) { + DSSERR("failed to start device\n"); + goto err0; + } + if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) { r = -EINVAL; goto err1; @@ -487,7 +493,11 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) dssdev->state = OMAP_DSS_DISPLAY_ACTIVE; + mutex_unlock(&venc.venc_lock); + return 0; err1: + omap_dss_stop_device(dssdev); +err0: mutex_unlock(&venc.venc_lock); return r; @@ -511,6 +521,8 @@ static void venc_panel_disable(struct omap_dss_device *dssdev) venc_power_off(dssdev); dssdev->state = OMAP_DSS_DISPLAY_DISABLED; + + omap_dss_stop_device(dssdev); end: mutex_unlock(&venc.venc_lock); } |