diff options
Diffstat (limited to 'drivers/video/omap2/dss/venc.c')
-rw-r--r-- | drivers/video/omap2/dss/venc.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index f0ba5732d84a..eff35050e28a 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c | |||
@@ -479,12 +479,6 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) | |||
479 | goto err1; | 479 | goto err1; |
480 | } | 480 | } |
481 | 481 | ||
482 | if (dssdev->platform_enable) { | ||
483 | r = dssdev->platform_enable(dssdev); | ||
484 | if (r) | ||
485 | goto err2; | ||
486 | } | ||
487 | |||
488 | venc_power_on(dssdev); | 482 | venc_power_on(dssdev); |
489 | 483 | ||
490 | venc.wss_data = 0; | 484 | venc.wss_data = 0; |
@@ -494,13 +488,9 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) | |||
494 | /* wait couple of vsyncs until enabling the LCD */ | 488 | /* wait couple of vsyncs until enabling the LCD */ |
495 | msleep(50); | 489 | msleep(50); |
496 | 490 | ||
497 | mutex_unlock(&venc.venc_lock); | ||
498 | |||
499 | return r; | ||
500 | err2: | ||
501 | venc_power_off(dssdev); | ||
502 | err1: | 491 | err1: |
503 | mutex_unlock(&venc.venc_lock); | 492 | mutex_unlock(&venc.venc_lock); |
493 | |||
504 | return r; | 494 | return r; |
505 | } | 495 | } |
506 | 496 | ||
@@ -524,9 +514,6 @@ static void venc_panel_disable(struct omap_dss_device *dssdev) | |||
524 | /* wait at least 5 vsyncs after disabling the LCD */ | 514 | /* wait at least 5 vsyncs after disabling the LCD */ |
525 | msleep(100); | 515 | msleep(100); |
526 | 516 | ||
527 | if (dssdev->platform_disable) | ||
528 | dssdev->platform_disable(dssdev); | ||
529 | |||
530 | dssdev->state = OMAP_DSS_DISPLAY_DISABLED; | 517 | dssdev->state = OMAP_DSS_DISPLAY_DISABLED; |
531 | end: | 518 | end: |
532 | mutex_unlock(&venc.venc_lock); | 519 | mutex_unlock(&venc.venc_lock); |