Commit 35bc42c5 authored by Jani Nikula's avatar Jani Nikula Committed by Tomi Valkeinen

OMAP: DSS2: VENC: don't call platform_enable/disable() twice

platform_enable/disable() is already called in venc_power_on/off(), so
don't do it again in venc_panel_enable/disable().
Signed-off-by: default avatarJani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 27b67c92
...@@ -479,12 +479,6 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) ...@@ -479,12 +479,6 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
goto err1; goto err1;
} }
if (dssdev->platform_enable) {
r = dssdev->platform_enable(dssdev);
if (r)
goto err2;
}
venc_power_on(dssdev); venc_power_on(dssdev);
venc.wss_data = 0; venc.wss_data = 0;
...@@ -494,13 +488,9 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) ...@@ -494,13 +488,9 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
/* wait couple of vsyncs until enabling the LCD */ /* wait couple of vsyncs until enabling the LCD */
msleep(50); msleep(50);
mutex_unlock(&venc.venc_lock);
return r;
err2:
venc_power_off(dssdev);
err1: err1:
mutex_unlock(&venc.venc_lock); mutex_unlock(&venc.venc_lock);
return r; return r;
} }
...@@ -524,9 +514,6 @@ static void venc_panel_disable(struct omap_dss_device *dssdev) ...@@ -524,9 +514,6 @@ static void venc_panel_disable(struct omap_dss_device *dssdev)
/* wait at least 5 vsyncs after disabling the LCD */ /* wait at least 5 vsyncs after disabling the LCD */
msleep(100); msleep(100);
if (dssdev->platform_disable)
dssdev->platform_disable(dssdev);
dssdev->state = OMAP_DSS_DISPLAY_DISABLED; dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
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