Skip to content

Commit

Permalink
OMAP: DSS2: Remove redundant enable/disable calls from SDI
Browse files Browse the repository at this point in the history
Panel enable/disable is now done via the panel driver, so we should not
call the panel driver again

Signed-off-by: Roger Quadros <roger.quadros@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
  • Loading branch information
Roger Quadros authored and Tomi Valkeinen committed May 18, 2010
1 parent b4d78bf commit b1d145b
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions drivers/video/omap2/dss/sdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,9 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)

dssdev->manager->enable(dssdev->manager);

if (dssdev->driver->enable) {
r = dssdev->driver->enable(dssdev);
if (r)
goto err3;
}

sdi.skip_init = 0;

return 0;
err3:
dssdev->manager->disable(dssdev->manager);
err2:
dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
err1:
Expand All @@ -137,9 +129,6 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable);

void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
{
if (dssdev->driver->disable)
dssdev->driver->disable(dssdev);

dssdev->manager->disable(dssdev->manager);

dss_sdi_disable();
Expand Down

0 comments on commit b1d145b

Please sign in to comment.