From 6f5619835ee1dd9b0e510ca46a47c695020b14cc Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Tue, 20 Nov 2012 14:58:17 +0530 Subject: [PATCH] --- yaml --- r: 371342 b: refs/heads/master c: 77ec05d06fa8a6da65f104382b1026e413119df6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/venc.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7125dc5a6bfc..50d765c7d2aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af9f6c35563079cb0ea9b429983914cd4e2c24f3 +refs/heads/master: 77ec05d06fa8a6da65f104382b1026e413119df6 diff --git a/trunk/drivers/video/omap2/dss/venc.c b/trunk/drivers/video/omap2/dss/venc.c index 006caf3cb509..1598d27c2896 100644 --- a/trunk/drivers/video/omap2/dss/venc.c +++ b/trunk/drivers/video/omap2/dss/venc.c @@ -519,10 +519,6 @@ int omapdss_venc_display_enable(struct omap_dss_device *dssdev) goto err0; } - if (dssdev->platform_enable) - dssdev->platform_enable(dssdev); - - r = venc_power_on(dssdev); if (r) goto err1; @@ -533,8 +529,6 @@ int omapdss_venc_display_enable(struct omap_dss_device *dssdev) return 0; err1: - if (dssdev->platform_disable) - dssdev->platform_disable(dssdev); omap_dss_stop_device(dssdev); err0: mutex_unlock(&venc.venc_lock); @@ -551,9 +545,6 @@ void omapdss_venc_display_disable(struct omap_dss_device *dssdev) omap_dss_stop_device(dssdev); - if (dssdev->platform_disable) - dssdev->platform_disable(dssdev); - mutex_unlock(&venc.venc_lock); }