From patchwork Mon Nov 22 08:51:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Cousson X-Patchwork-Id: 347211 X-Patchwork-Delegate: hiroshi.doyu@nokia.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 oAM8pCcu024124 for ; Mon, 22 Nov 2010 08:51:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752550Ab0KVIvV (ORCPT ); Mon, 22 Nov 2010 03:51:21 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:40137 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752319Ab0KVIvU (ORCPT ); Mon, 22 Nov 2010 03:51:20 -0500 Received: from dlep33.itg.ti.com ([157.170.170.112]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id oAM8pI49004969 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 22 Nov 2010 02:51:18 -0600 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id oAM8pIk4026583; Mon, 22 Nov 2010 02:51:18 -0600 (CST) Received: from dlee73.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id oAM8pItQ010504; Mon, 22 Nov 2010 02:51:18 -0600 (CST) Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE73.ent.ti.com (157.170.170.88) with Microsoft SMTP Server id 8.3.106.1; Mon, 22 Nov 2010 02:51:17 -0600 Received: from localhost.localdomain (lncpu04.tif.ti.com [137.167.102.15]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id oAM8p3EF019174; Mon, 22 Nov 2010 02:51:16 -0600 From: Benoit Cousson To: CC: , Rajendra Nayak , Benoit Cousson , Kevin Hilman Subject: [PATCH 4/4] OMAP: hwmod: Disable clocks when hwmod enable fails Date: Mon, 22 Nov 2010 09:51:00 +0100 Message-ID: <1290415860-15632-5-git-send-email-b-cousson@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1290415860-15632-1-git-send-email-b-cousson@ti.com> References: <1290415860-15632-1-git-send-email-b-cousson@ti.com> MIME-Version: 1.0 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]); Mon, 22 Nov 2010 08:51:22 +0000 (UTC) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index f221587..896012d 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -1210,6 +1210,7 @@ int _omap_hwmod_enable(struct omap_hwmod *oh) _enable_sysc(oh); } } else { + _disable_clocks(oh); pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n", oh->name, r); }