Commit 14572c63 authored by Tomi Valkeinen's avatar Tomi Valkeinen

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent bcd8e374
...@@ -476,6 +476,12 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) ...@@ -476,6 +476,12 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
mutex_lock(&venc.venc_lock); 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) { if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
r = -EINVAL; r = -EINVAL;
goto err1; goto err1;
...@@ -487,7 +493,11 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) ...@@ -487,7 +493,11 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE; dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
mutex_unlock(&venc.venc_lock);
return 0;
err1: err1:
omap_dss_stop_device(dssdev);
err0:
mutex_unlock(&venc.venc_lock); mutex_unlock(&venc.venc_lock);
return r; return r;
...@@ -511,6 +521,8 @@ static void venc_panel_disable(struct omap_dss_device *dssdev) ...@@ -511,6 +521,8 @@ static void venc_panel_disable(struct omap_dss_device *dssdev)
venc_power_off(dssdev); venc_power_off(dssdev);
dssdev->state = OMAP_DSS_DISPLAY_DISABLED; dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
omap_dss_stop_device(dssdev);
end: end:
mutex_unlock(&venc.venc_lock); mutex_unlock(&venc.venc_lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment