From patchwork Thu Sep 14 17:27:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 9953621 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 106FE6024A for ; Thu, 14 Sep 2017 17:29:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4DD428F04 for ; Thu, 14 Sep 2017 17:29:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9C212911D; Thu, 14 Sep 2017 17:29:25 +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=unavailable 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 878EA28F04 for ; Thu, 14 Sep 2017 17:29:25 +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:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=Pwid87flU1XHKoCG2Kz/JXeLngoJHBQhf6R0OO9xCT0=; b=lpa 5WEiSQDZDod0RQSxxoJ7mGSIO8cjO5rFFxzPXMZAcjZwW0kzR1fgrwteIn05BNx6U80kkgP3I1obT QsrVwOkWynRIAmuppIDo9VSp8PD3/97DRzIeb4pJosS1MAmoyqyPeOYhvpbmU/nh3RhzK+mAJrAD0 OwTn2jMVMsiWcNWP6NIvZLWVYH257u9PEqRuxyebC3t+WHA8m5DeJvxkqilIgW+24D3YxAA91fsyv YxxoonhF7txiUs2LigqDmGRLfSVz6OOO+eg0J5hcDIN98OHB/lE/WW+PKoLqTADG37y1cLc2/O9+I GgMlz4Mq9BX/dFuaGL43yk/VaURXxMA==; 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 1dsXx5-00039W-Ng; Thu, 14 Sep 2017 17:29:23 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dsXwS-0002ry-5N; Thu, 14 Sep 2017 17:28:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Date:Message-Id:In-Reply-To:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=uVDA7MjYdhJ6328s57RPQ90DdR6xA3gVRGTsAZFKA3g=; b=LbB95el5EdmIsasTiLSFxo2H3f Gm+nXdlv+qbsNUwIwP6GnvLmzu68fcTLSLvrHisqN7MyRTjtjvG5GGzMMaAgum/tY1GWqUxGogUgn 1Y7i6XKIfOBi4APhqZGFp427yEFukAaJ9xkofvyr+JtXdKZFyQCSHFBIOJChXpiDrh/NQl3QBrRk4 hLVtNgZeyHn6QduU9X0F3dfbXEKuytG3v5wMskaNOv8cqo2UGPo7pdW9onclLdiEnnnfevP10jdjp 4H4u7PcvAbnsd8oDcNot7TLmLB8NZdUUCPC0+t4uiVG9Z4F2Js3VDusnziV3HPAy/+Bde4UAkmL7x eBoGzh1Q==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dsXwO-0005G4-Qt; Thu, 14 Sep 2017 17:28:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=uVDA7MjYdhJ6328s57RPQ90DdR6xA3gVRGTsAZFKA3g=; b=blg+akIv8tBs o+3KR3DQWuu9v7xd9B0dokHZTOdxrB5loGSuSaaCNXLGSchlibBvNBBm15+PSzcogij6vhQY4UaVw 31bdBkBSXE6tfJg7irmUv4/urFerSdUwrlD2VI9ZlJ9TE8w+PkuXnSIZT+/bzFa71ciz8tE9LOjFi MjYtw=; Received: from [12.145.98.253] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dsXv4-000376-MR; Thu, 14 Sep 2017 17:27:18 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 1B3CE4400D2; Thu, 14 Sep 2017 10:27:17 -0700 (PDT) From: Mark Brown To: John Keeping Subject: Applied "ASoC: rockchip: i2s: fix unbalanced clk_disable" to the asoc tree In-Reply-To: <20170914155855.28768-1-john@metanate.com> Message-Id: <20170914172717.1B3CE4400D2@finisterre.ee.mobilebroadband> Date: Thu, 14 Sep 2017 10:27:17 -0700 (PDT) X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. 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: alsa-devel@alsa-project.org, Heiko Stuebner , linux-kernel@vger.kernel.org, Liam Girdwood , Takashi Iwai , linux-rockchip@lists.infradead.org, Mark Brown , 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 The patch ASoC: rockchip: i2s: fix unbalanced clk_disable has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 32debfcd3ff0939c93238ddde03ffcc96cca5c60 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Thu, 14 Sep 2017 16:58:55 +0100 Subject: [PATCH] ASoC: rockchip: i2s: fix unbalanced clk_disable 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 Signed-off-by: Mark Brown --- 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 199338fdeda0..a7972c2d4e7b 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -694,7 +694,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;