Skip to content

Commit

Permalink
OMAP: DSS2: VENC: don't call platform_enable/disable() twice
Browse files Browse the repository at this point in the history
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: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
  • Loading branch information
Jani Nikula authored and Tomi Valkeinen committed May 18, 2010
1 parent 27b67c9 commit 35bc42c
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions drivers/video/omap2/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,12 +479,6 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
goto err1;
}

if (dssdev->platform_enable) {
r = dssdev->platform_enable(dssdev);
if (r)
goto err2;
}

venc_power_on(dssdev);

venc.wss_data = 0;
Expand All @@ -494,13 +488,9 @@ static int venc_panel_enable(struct omap_dss_device *dssdev)
/* wait couple of vsyncs until enabling the LCD */
msleep(50);

mutex_unlock(&venc.venc_lock);

return r;
err2:
venc_power_off(dssdev);
err1:
mutex_unlock(&venc.venc_lock);

return r;
}

Expand All @@ -524,9 +514,6 @@ static void venc_panel_disable(struct omap_dss_device *dssdev)
/* wait at least 5 vsyncs after disabling the LCD */
msleep(100);

if (dssdev->platform_disable)
dssdev->platform_disable(dssdev);

dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
end:
mutex_unlock(&venc.venc_lock);
Expand Down

0 comments on commit 35bc42c

Please sign in to comment.