From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7532C47075 for ; Wed, 15 Nov 2023 03:42:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234408AbjKODmr (ORCPT ); Tue, 14 Nov 2023 22:42:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234361AbjKODm3 (ORCPT ); Tue, 14 Nov 2023 22:42:29 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14C08D41; Tue, 14 Nov 2023 19:42:24 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8610CC433C8; Wed, 15 Nov 2023 03:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700019743; bh=Ode+0TAMlI4i52OixLmxUPLos4XbEqp0mr+Ivux6rBE=; h=From:To:Cc:Subject:Date:From; b=u7nHKGY+do2eIaxDG2hQJPkCYL1jej2d+pUV4cb7YZCbieAd+En7JTPVH3zGl96Co Uy+6hLxffdrzXY1TTCgKOQ0Frphzf8zcOd9iFe7VzeEmJbESFcAQVbLMDcM5aGyU1+ j5g+uY6KsGXjrFc6bvDld+tCYskELCgvi8eBNf9euIi85leqvNZzQgAszIpBQiVLex Zap5qYUWizNXsiGz9dm/bt7KNybuJpLXv9Syh+oijc3+G/WuiThaYxoaEu1H8fkJdv gywdXOMLNsU5Bvn4e1K6uHDqCez6QLWvUS0+vW8N7LZBXLwR2wYnXsYPHfhIWCx/e6 XqTkGpXv72mKg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tony Lindgren , Andreas Kemnade , Mark Brown , Sasha Levin , peter.ujfalusi@gmail.com, jarkko.nikula@bitmer.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 1/2] ASoC: ti: omap-mcbsp: Fix runtime PM underflow warnings Date: Tue, 14 Nov 2023 22:41:53 -0500 Message-ID: <20231115034155.1241251-1-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.260 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tony Lindgren [ Upstream commit fbb74e56378d8306f214658e3d525a8b3f000c5a ] We need to check for an active device as otherwise we get warnings for some mcbsp instances for "Runtime PM usage count underflow!". Reported-by: Andreas Kemnade Signed-off-by: Tony Lindgren Link: https://lore.kernel.org/r/20231030052340.13415-1-tony@atomide.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/ti/omap-mcbsp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 3273b317fa3b9..3e8ed05f3ebd8 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -74,7 +74,8 @@ static int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id) return -EINVAL; } - pm_runtime_put_sync(mcbsp->dev); + if (mcbsp->active) + pm_runtime_put_sync(mcbsp->dev); r = clk_set_parent(mcbsp->fclk, fck_src); if (r) { @@ -84,7 +85,8 @@ static int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id) return r; } - pm_runtime_get_sync(mcbsp->dev); + if (mcbsp->active) + pm_runtime_get_sync(mcbsp->dev); clk_put(fck_src); -- 2.42.0