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: 112588 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1020005qgf; Thu, 14 Sep 2017 10:27:29 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAWlhwT9nyTVx4v59N1b5DTeIHBQimohOniNnZY6+tI2nvMtk0vVG7CL6ME0r1ugaLfHo0S X-Received: by 10.223.178.193 with SMTP id g59mr7178494wrd.0.1505410049091; Thu, 14 Sep 2017 10:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505410049; cv=none; d=google.com; s=arc-20160816; b=RHR04sZHCwZMCfvfWzBwUF/M9JXI7pLDNnwXUCphfsd56wR/umZvmVcKSeteanQ1iV gEhwRhTTt9R82ucy/XENTSpBiLmK0mloHx66BUdfc08SmPH1Cigjy+15O+eT0+Fk3MWJ dgucdRW6Wy0RspkLOsecVvd138VhavGz/BS1QxOO/8uLpHQpZWDhgHASRqb5YA6JxadI KmoQjZAhaO2DhDpLLqhYmaqe3q9x7UWQjg8JIEH8uKXjE1q/Wd1WD2PMTVAVRoqqFZnh CCpqUlCOMtfJtEm4ldR/M+zCPfIggZSPt+QGFeMY4IbqvGN/D1Y5DiJESeqdzyGxh3ZQ LQGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=/0ncUuDfbd9Nekr0QlshaqN+GrlZ7WF+jSiTjRSJ/nc=; b=KJkrvPhRwDyMzGlqxSWe3MuL+IlNb+9DYQJYoqBcfYvcitajTUsaYhu1VxrShMO5/T Xo+H7Ce9pBjjbPUcjZOq06DjQ5/SGS5m2V/gljevGOoZg4sPVzpPnNHcJe088RPyVQSF iBb/AJyfeKWI4ylirvhaBSY2XjCLPTA/PXNKWc7n0Dyamz11jz2Y8vOb73H13XsVka/C q+xBl/po6T9DI2bLhhsgN3jgHRv3yO7kqfJw0BtPq3BYyeYGvpHgEYTRpj6kNBauZ4O4 BHhyfAXjtmuxtQ91dX9THP0fNwBtkxjNKkzfSdF0EnUS1FHM56ehI8WliGMQFJ8LOsgq 0hUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=blg+akIv; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id o23si11625234wra.403.2017.09.14.10.27.28; Thu, 14 Sep 2017 10:27:29 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=blg+akIv; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id EA4052671FF; Thu, 14 Sep 2017 19:27:26 +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 3E2BF267203; Thu, 14 Sep 2017 19:27:25 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 5C844266986 for ; Thu, 14 Sep 2017 19:27:22 +0200 (CEST) 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 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) 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 Subject: [alsa-devel] Applied "ASoC: rockchip: i2s: fix unbalanced clk_disable" to the asoc tree 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 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(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel 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;