From 699d0857f18d50e5df1fe1da9806eae08068f587 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 15 Nov 2012 13:20:02 +0200 Subject: [PATCH] --- yaml --- r: 344661 b: refs/heads/master c: 251886d8bc6f565c14acb34b12c007b994c2e56d h: refs/heads/master i: 344659: 20e0aee495a6c327e85191d61492c5fe37ca74e4 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8f5c96395838..0b73eef01e30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c91ee8cc9fa785ed9c4ad250d3f293f279153fe +refs/heads/master: 251886d8bc6f565c14acb34b12c007b994c2e56d diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index 531961424d33..fff26fd5d17f 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -3232,14 +3232,24 @@ unsigned long dispc_core_clk_rate(void) static unsigned long dispc_plane_pclk_rate(enum omap_plane plane) { - enum omap_channel channel = dispc_ovl_get_channel_out(plane); + enum omap_channel channel; + + if (plane == OMAP_DSS_WB) + return 0; + + channel = dispc_ovl_get_channel_out(plane); return dispc_mgr_pclk_rate(channel); } static unsigned long dispc_plane_lclk_rate(enum omap_plane plane) { - enum omap_channel channel = dispc_ovl_get_channel_out(plane); + enum omap_channel channel; + + if (plane == OMAP_DSS_WB) + return 0; + + channel = dispc_ovl_get_channel_out(plane); return dispc_mgr_lclk_rate(channel); }