Skip to content

Commit

Permalink
OMAP: DSS2: VENC: Add missing start/stop_device calls
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tomi Valkeinen committed May 11, 2011
1 parent bcd8e37 commit 14572c6
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions drivers/video/omap2/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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);
}
Expand Down

0 comments on commit 14572c6

Please sign in to comment.