From patchwork Wed Jan 5 13:53:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 453481 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p05DrDwc017212 for ; Wed, 5 Jan 2011 13:53:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750983Ab1AENxL (ORCPT ); Wed, 5 Jan 2011 08:53:11 -0500 Received: from na3sys009aog104.obsmtp.com ([74.125.149.73]:42095 "EHLO na3sys009aog104.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750699Ab1AENxK (ORCPT ); Wed, 5 Jan 2011 08:53:10 -0500 Received: from source ([209.85.218.48]) by na3sys009aob104.postini.com ([74.125.148.12]) with SMTP ID DSNKTSR3xa5p6B9+jlFM/FFGxxip2XWA2cc2@postini.com; Wed, 05 Jan 2011 05:53:09 PST Received: by yib17 with SMTP id 17so4910714yib.7 for ; Wed, 05 Jan 2011 05:53:09 -0800 (PST) Received: by 10.236.105.129 with SMTP id k1mr14001845yhg.2.1294235589331; Wed, 05 Jan 2011 05:53:09 -0800 (PST) From: Santosh Shilimkar References: <1294234855-6623-1-git-send-email-santosh.shilimkar@ti.com> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 In-Reply-To: <1294234855-6623-1-git-send-email-santosh.shilimkar@ti.com> Thread-Index: Acus3jRH1GbZ5lNcRQuTsIvG4s/fFgAADOng X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579 Date: Wed, 5 Jan 2011 19:23:07 +0530 Message-ID: <68789fa8ba11b9427aa6321da55c9a8b@mail.gmail.com> Subject: RE: [PATCH] omap: wd_timer: Fix crash frm wdt_probe when !CONFIG_RUNTIME_PM To: Paul Walmsley Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org 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 (demeter1.kernel.org [140.211.167.41]); Wed, 05 Jan 2011 13:53:15 +0000 (UTC) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index e66687b..b879a16 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -378,7 +378,11 @@ void __init omap2_init_common_infrastructure(void) * XXX ideally we could detect whether the MPU WDT was currently * enabled here and make this conditional */ +#ifdef CONFIG_PM_RUNTIME postsetup_state = _HWMOD_STATE_DISABLED; +#else + postsetup_state = _HWMOD_STATE_ENABLED; +#endif omap_hwmod_for_each_by_class("wd_timer", _set_hwmod_postsetup_state, &postsetup_state);