From patchwork Mon Mar 28 11:31:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 8679751 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9814DC0553 for ; Mon, 28 Mar 2016 15:35:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C772E20253 for ; Mon, 28 Mar 2016 15:35:29 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 9F1A920220 for ; Mon, 28 Mar 2016 15:35:28 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 096BF2664A3; Mon, 28 Mar 2016 17:35:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CBCAA265854; Mon, 28 Mar 2016 14:40:33 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8B8ED2655F7; Mon, 28 Mar 2016 14:40:32 +0200 (CEST) Received: from mail-qg0-f42.google.com (mail-qg0-f42.google.com [209.85.192.42]) by alsa0.perex.cz (Postfix) with ESMTP id 3D39D2657B3 for ; Mon, 28 Mar 2016 13:31:44 +0200 (CEST) Received: by mail-qg0-f42.google.com with SMTP id j35so106047188qge.0 for ; Mon, 28 Mar 2016 04:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=c1BsrUTd+5mbYNt5Du0fj/WMjoxxAeldEwdfiALJM58=; b=nNOFCrAwaB3CeZnMFbalSHbhPXjx1Y4F4sM/kUYD/CxDCXDm0O54JAFDA5JtLkRETr VF6Ha2Lb9GXadKfXBf7ROI7o1SnjF6/UStCz1M9Xft3q7yDeZ1MUUpP1DLsxj8sSFDDg pYtfhJRpbGPMEqwrSthlMiysR2cNpCRMfeSrO09nDHe+0bHl5MwMJ3NOFL1KT9bumRth y1lyxWSxqnVwMlG2BOoFXFk+kpEAmyqJxdlpdEb8s+xpq2g1mhW91iaN8vUyT6VgBWce TUV6Wgb1/A12YZ8t71SlLYGyIQ5Ph3EI6QYYGdO4MTt2Zd77cBNflh2J9On5Rmfsm5NR Yw9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=c1BsrUTd+5mbYNt5Du0fj/WMjoxxAeldEwdfiALJM58=; b=mE9z5DO20HnkhpB53v0hnakunkxptQcEsLY+XFm2H0dSmmqf1dbl98w1O+qAwfgQpn aDnu9ANcn5NsfuGoEWQuCPcgnrzThE5zaOGQKXaV7kunSAT6sMNLfAUlmouIqssJ2ogM WkXQC/8bBJ5NoBE0J3UHZbzFeX3hM54483gd4SCnhUJToym0P3aX1X+eeoiMPYMEXwif 9daTMmLJbw3eAEWHybZEBxWnmK4NgG3G6w4PFsONCEbpLADoep8tz0tDP16uASIvzYm/ 2WISXrxLa/rrhU6sNp2/rPtP9YITdY+JE5DBFMWQTgrtcYw3t9IsibtOgSjF+iIkzSnx on3Q== X-Gm-Message-State: AD7BkJKOXgK6ZOHLHp26QcaQlvoAyXd5NlTxNX0Q5lGX71g0xk2aMRUFT+BNxQvH3CXMFw== X-Received: by 10.140.98.71 with SMTP id n65mr34262145qge.22.1459164703369; Mon, 28 Mar 2016 04:31:43 -0700 (PDT) Received: from localhost.localdomain ([187.180.185.191]) by smtp.gmail.com with ESMTPSA id v74sm11668350qkl.36.2016.03.28.04.31.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Mar 2016 04:31:42 -0700 (PDT) From: Fabio Estevam To: broonie@kernel.org Date: Mon, 28 Mar 2016 08:31:18 -0300 Message-Id: <1459164679-17961-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 Cc: Fabio Estevam , ckeepax@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org Subject: [alsa-devel] [PATCH 1/2] ASoC: wm8962: Disable clock if wm8962_runtime_resume() fails X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam When regulator_bulk_enable() fails inside wm8962_runtime_resume(), we should disable the previously enabled clock. Signed-off-by: Fabio Estevam Acked-by: Charles Keepax --- sound/soc/codecs/wm8962.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 8822360..f3f71ba 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3800,7 +3800,7 @@ static int wm8962_runtime_resume(struct device *dev) if (ret != 0) { dev_err(dev, "Failed to enable supplies: %d\n", ret); - return ret; + goto disable_clock; } regcache_cache_only(wm8962->regmap, false); @@ -3838,6 +3838,10 @@ static int wm8962_runtime_resume(struct device *dev) msleep(5); return 0; + +disable_clock: + clk_disable_unprepare(wm8962->pdata.mclk); + return ret; } static int wm8962_runtime_suspend(struct device *dev)