Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 261965
b: refs/heads/master
c: b88f58f
h: refs/heads/master
i:
  261963: 462682f
v: v3
  • Loading branch information
Tomi Valkeinen committed Jul 25, 2011
1 parent 10053c8 commit f608740
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cb5930bdb57393a6ab9dc0c96fe5f03dcfb5bf43
refs/heads/master: b88f58f091f7e771315bc74c28203b5248b96be0
4 changes: 0 additions & 4 deletions trunk/drivers/video/omap2/dss/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,6 @@ static int omap_dss_probe(struct platform_device *pdev)
goto err_dss;
}

/* keep clocks enabled to prevent context saves/restores during init */
dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK);
r = dispc_init_platform_driver();
if (r) {
DSSERR("Failed to initialize dispc platform driver\n");
Expand Down Expand Up @@ -237,8 +235,6 @@ static int omap_dss_probe(struct platform_device *pdev)
pdata->default_device = dssdev;
}

dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK);

return 0;

err_register:
Expand Down

0 comments on commit f608740

Please sign in to comment.