aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2010-10-28 09:46:38 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-05-11 07:19:25 -0400
commit14572c6356dc4361231ee8f4402468c1f36d2c34 (patch)
tree88158bc7225b217df86a260a56ede8845405867f
parentbcd8e374b5d39d481d00936e183b0ded99a5f31a (diff)
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>
-rw-r--r--drivers/video/omap2/dss/venc.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 983172672460..980f919ed987 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)
476 476
477 mutex_lock(&venc.venc_lock); 477 mutex_lock(&venc.venc_lock);
478 478
479 r = omap_dss_start_device(dssdev);
480 if (r) {
481 DSSERR("failed to start device\n");
482 goto err0;
483 }
484
479 if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) { 485 if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
480 r = -EINVAL; 486 r = -EINVAL;
481 goto err1; 487 goto err1;
@@ -487,7 +493,11 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
487 493
488 dssdev->state = OMAP_DSS_DISPLAY_ACTIVE; 494 dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
489 495
496 mutex_unlock(&venc.venc_lock);
497 return 0;
490err1: 498err1:
499 omap_dss_stop_device(dssdev);
500err0:
491 mutex_unlock(&venc.venc_lock); 501 mutex_unlock(&venc.venc_lock);
492 502
493 return r; 503 return r;
@@ -511,6 +521,8 @@ static void venc_panel_disable(struct omap_dss_device *dssdev)
511 venc_power_off(dssdev); 521 venc_power_off(dssdev);
512 522
513 dssdev->state = OMAP_DSS_DISPLAY_DISABLED; 523 dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
524
525 omap_dss_stop_device(dssdev);
514end: 526end:
515 mutex_unlock(&venc.venc_lock); 527 mutex_unlock(&venc.venc_lock);
516} 528}