From patchwork Wed Mar 10 18:42:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 84666 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2AIgRYp003222 for ; Wed, 10 Mar 2010 18:42:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755802Ab0CJSm1 (ORCPT ); Wed, 10 Mar 2010 13:42:27 -0500 Received: from mail-qy0-f204.google.com ([209.85.221.204]:58983 "EHLO mail-qy0-f204.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754673Ab0CJSm0 convert rfc822-to-8bit (ORCPT ); Wed, 10 Mar 2010 13:42:26 -0500 Received: by qyk42 with SMTP id 42so1819922qyk.19 for ; Wed, 10 Mar 2010 10:42:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=cccfJq53Y4H+RIAEvQ9kX7+7JK7mkU7k4TGGWHsLpWc=; b=aK3+rWa1JBDo8rsrKBdOvdBuCB7py37G631Q4pQretI/YrAE/14TSCb5iL4hRno/y2 anbhKbtSQvvgFywn8BM+nLb1CRoTjTHi4w4vL+XZpBcp6eGPQl+0ZOt2USlMN+CeHuM1 Rx1aLvcZKu5sBxUW3EHmU6jYc1yDA6TP262kk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=Es9xCgH7NOkBJ5doH74BOXS3V0vQScsDy3rTQM0x+hzDv/4SXUMe3Kk2skUmFC9hQV yqCDE0qFduLCMfbzCiSMOp0bc+ctdhEhY1WH1+Aq3B5qjUhUUJ2qCqSopLtL2vJkqR0B Rgru1VTM6fLMz4T9igLhIqUv7Db6XGKZQf+mQ= MIME-Version: 1.0 Received: by 10.229.192.20 with SMTP id do20mr1846322qcb.62.1268246541749; Wed, 10 Mar 2010 10:42:21 -0800 (PST) In-Reply-To: <5e088bd91003101016s4148751es1a142c21d1540564@mail.gmail.com> References: <5e088bd91003091158l6cfa0b76u204e5432389d573@mail.gmail.com> <5e088bd91003101016s4148751es1a142c21d1540564@mail.gmail.com> Date: Wed, 10 Mar 2010 10:42:21 -0800 Message-ID: <5e088bd91003101042t236c5d90p62c700c424d83e12@mail.gmail.com> Subject: Re: kernel panic with latest DSS From: Steve Sakoman To: linux-omap@vger.kernel.org, Tomi Valkeinen Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 10 Mar 2010 18:42:28 +0000 (UTC) diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index e777e35..be9b3de 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -2218,7 +2218,7 @@ unsigned long dispc_fclk_rate(void) { unsigned long r = 0; - if (dss_get_dispc_clk_source() == DSS_SRC_DSS1_ALWON_FCLK) + if (dss_get_dispc_clk_source() == 0) r = dss_clk_get_rate(DSS_CLK_FCK1); else #ifdef CONFIG_OMAP2_DSS_DSI