From patchwork Fri May 7 15:44:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Cousson X-Patchwork-Id: 97758 X-Patchwork-Delegate: khilman@deeprootsystems.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 o47FiPiM021990 for ; Fri, 7 May 2010 15:44:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756687Ab0EGPoc (ORCPT ); Fri, 7 May 2010 11:44:32 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:58167 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755276Ab0EGPoa (ORCPT ); Fri, 7 May 2010 11:44:30 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o47FiTl2005178 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 7 May 2010 10:44:29 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o47FiFbV001882; Fri, 7 May 2010 10:44:26 -0500 (CDT) From: Benoit Cousson To: linux-omap@vger.kernel.org Cc: Benoit Cousson , Paul Walmsley Subject: [PATCH 08/10] OMAP: hwmod: Do not exit the iteration if one clock init failed Date: Fri, 7 May 2010 17:44:13 +0200 Message-Id: <1273247055-15165-9-git-send-email-b-cousson@ti.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1273247055-15165-1-git-send-email-b-cousson@ti.com> References: <1273247055-15165-1-git-send-email-b-cousson@ti.com> 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]); Fri, 07 May 2010 15:44:44 +0000 (UTC) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 5d3a3ea..b624ad6 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -783,9 +783,10 @@ static int _init_clocks(struct omap_hwmod *oh) ret |= _init_interface_clks(oh); ret |= _init_opt_clks(oh); - oh->_state = _HWMOD_STATE_CLKS_INITED; + if (!ret) + oh->_state = _HWMOD_STATE_CLKS_INITED; - return ret; + return 0; } /**