From f608740327e22582b1d98a02b826e84bef04a998 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Mon, 23 May 2011 15:39:36 +0300 Subject: [PATCH] --- yaml --- r: 261965 b: refs/heads/master c: b88f58f091f7e771315bc74c28203b5248b96be0 h: refs/heads/master i: 261963: 462682f400e933e24516cf7e30b7b7e24dd25435 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/core.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a9c12d75b8ac..39165e60e8ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb5930bdb57393a6ab9dc0c96fe5f03dcfb5bf43 +refs/heads/master: b88f58f091f7e771315bc74c28203b5248b96be0 diff --git a/trunk/drivers/video/omap2/dss/core.c b/trunk/drivers/video/omap2/dss/core.c index 3380a9196fdb..76821fefce9a 100644 --- a/trunk/drivers/video/omap2/dss/core.c +++ b/trunk/drivers/video/omap2/dss/core.c @@ -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"); @@ -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: