From patchwork Wed Jul 8 00:17:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 34529 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n680I3KE015995 for ; Wed, 8 Jul 2009 00:18:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757947AbZGHARq (ORCPT ); Tue, 7 Jul 2009 20:17:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757954AbZGHARp (ORCPT ); Tue, 7 Jul 2009 20:17:45 -0400 Received: from mail-px0-f181.google.com ([209.85.216.181]:39434 "EHLO mail-px0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757943AbZGHARp (ORCPT ); Tue, 7 Jul 2009 20:17:45 -0400 Received: by mail-px0-f181.google.com with SMTP id 11so19465pxi.33 for ; Tue, 07 Jul 2009 17:17:44 -0700 (PDT) Received: by 10.142.171.3 with SMTP id t3mr2470165wfe.334.1247012264770; Tue, 07 Jul 2009 17:17:44 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 31sm1296074wff.18.2009.07.07.17.17.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 07 Jul 2009 17:17:44 -0700 (PDT) From: Kevin Hilman To: paul@pwsan.com Cc: linux-omap@vger.kernel.org Subject: [PATCH 2/2] OMAP2/3/4: omap_hwmod: fix reset bug Date: Tue, 7 Jul 2009 17:17:37 -0700 Message-Id: <1247012257-19407-3-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1247012257-19407-2-git-send-email-khilman@deeprootsystems.com> References: <1247012257-19407-1-git-send-email-khilman@deeprootsystems.com> <1247012257-19407-2-git-send-email-khilman@deeprootsystems.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The _reset() hook should early when _soft_reset() fails, not it if succeeds. Currently, it aborts when _soft_reset() succeeds, resulting in not waiting for RESETDONE. Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/omap_hwmod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index b103797..76b6845 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -746,7 +746,7 @@ static int _reset(struct omap_hwmod *oh) v = oh->_sysc_cache; r = _set_softreset(oh, &v); - if (!r) + if (r) return r; _write_sysconfig(v, oh);