From patchwork Thu Sep 14 15:58:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Keeping X-Patchwork-Id: 9953469 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ABE4D602C9 for ; Thu, 14 Sep 2017 16:00:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7293291C5 for ; Thu, 14 Sep 2017 16:00:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B56F5292C6; Thu, 14 Sep 2017 16:00:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F187C29231 for ; Thu, 14 Sep 2017 16:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=QbSpU4Sy3ockTmyDt7DHlGlO+uyLbeOcj/vPBwhCKQQ=; b=Rs9 pRkzWG6tLFfpMvu2eqsNw0wUNkGhxRJGqSrLstfl52AGjhEeH418iur1e2GwrEjJuQKVk3xpAW/c8 EQu2T0qebkmZqETZj+nTyf4H4a2fEPA7B1UvxedhI2qnXOZUaz116bE+34D0RkKJBQwqqdVA8kJwo 10elyddgxdNECbWxpohNYi98sLBiN70sK/WHu+NZrnpfZOJkVmf29ooJTf2SocyCY+neGWJ1N6bU8 ZgoxgqwPHhw1L+4Q6mbajP5G6X8ZBxSmO5dVLq1P2sWvw66HYAXv6ALz0w50SAkyXMoWNf/GBC4og dZykcIL9t0ZCYW2JdA/6K/PB0DSF+jw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dsWYp-0007aC-QP; Thu, 14 Sep 2017 16:00:15 +0000 Received: from dougal.metanate.com ([90.155.101.14] helo=metanate.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dsWYU-0006Os-CL; Thu, 14 Sep 2017 15:59:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=metanate.com; s=stronger; h=Message-Id:Date:Subject:Cc:To:From; bh=UAOsFaN8HQYIM8iHMiiET1g5rpJbm/YsyfZ9+DhQWpM=; b=uJ5qshP8gZlT/9CIiAaNsh52p455lsJ5OvyGb8wfT8IsG8JiXR5gHK486cFJ/zbUcy3ZOK99k01FJwsL2wCUilkh+jUlZewA39XP7jXTAJHCN5AWmDjp8JvzBWC4yxsBnYLXtMnsehx1Mwfq56uR5XemLrM5gHcDfKL27qsdzQ8MXbrlzcEjM34UcQnjsDpcmXCWNvVrjrcoLTolVoc3tR9eJNoQaSsDxQE3Iv82EjBJmlNZ1IJhdUzBWUjaHGE61FDSJuyH379bemAWues/WGlTiAHcHsh0ahTywrzlpEZrQ0Ds7UgMlsjdLKSfGQa5EQNbt7UE9DHWf0kinVfICg==; Received: from johnkeeping.plus.com ([81.174.171.191] helo=localhost.localdomain) by shrek.metanate.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.83_RC2) (envelope-from ) id 1dsWXg-0003hU-Hs; Thu, 14 Sep 2017 16:59:04 +0100 From: John Keeping To: alsa-devel@alsa-project.org Subject: [PATCH] ASoC: rockchip: i2s: fix unbalanced clk_disable Date: Thu, 14 Sep 2017 16:58:55 +0100 Message-Id: <20170914155855.28768-1-john@metanate.com> X-Mailer: git-send-email 2.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170914_085954_614941_27868FDD X-CRM114-Status: UNSURE ( 8.32 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , linux-rockchip@lists.infradead.org, Mark Brown , John Keeping , Jaroslav Kysela , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP mclk is enabled and disabled only in i2s_runtime_{resume,suspend}() and we ensure that the device is runtime suspended before reaching this clk_disable_unprepare() call, so it is wrong to call it again here. Signed-off-by: John Keeping --- sound/soc/rockchip/rockchip_i2s.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index b6590467fd14..908211e1d6fc 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -692,7 +692,6 @@ static int rockchip_i2s_remove(struct platform_device *pdev) if (!pm_runtime_status_suspended(&pdev->dev)) i2s_runtime_suspend(&pdev->dev); - clk_disable_unprepare(i2s->mclk); clk_disable_unprepare(i2s->hclk); return 0;