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 13CC9C47075 for ; Wed, 15 Nov 2023 03:40:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234494AbjKODku (ORCPT ); Tue, 14 Nov 2023 22:40:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234505AbjKODkq (ORCPT ); Tue, 14 Nov 2023 22:40:46 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83077F4; Tue, 14 Nov 2023 19:40:42 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44358C433C8; Wed, 15 Nov 2023 03:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700019642; bh=tgzQdtPa7X8Llht4ya4Qi7g2A/ZnTMhqfQ+igMcRgxs=; h=From:To:Cc:Subject:Date:From; b=hzOru5y4oxmdFleeY7y4C5NNsy+5InpN2nPuWRKmfM2rBAmFoOFAFILZShMM0IFRc pzEoB7QqSxgjfoboSvtCw/3bdmCut5Gkl/GZzBmjMuQK3CzoBb8+Y0vnFgCqMUrHcJ rWQvq1VjBESmyNfgahbBTmgYVT0/5Xnuw6oN9O7dgkdleYMUYEVDTTHSEZcr8QHo/d +fXzgdXJLKkbn5TIA5n5ER2LI3NijylbcvyKdpZA/u2ETF4qcqOLCdKTOAYZpvOs5M 6h3s8PgZYNqcSzKJGbjKscqKgWrOH9jZSxqyXq5CXpAxjRBikDi7iW2NvgZO/+vXt7 zqHXhHR35to/g== 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.15 1/4] ASoC: ti: omap-mcbsp: Fix runtime PM underflow warnings Date: Tue, 14 Nov 2023 22:40:11 -0500 Message-ID: <20231115034024.1236659-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.15.138 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 4479d74f0a458..81d2be87e9739 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -74,14 +74,16 @@ 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) dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n", src); - pm_runtime_get_sync(mcbsp->dev); + if (mcbsp->active) + pm_runtime_get_sync(mcbsp->dev); clk_put(fck_src); -- 2.42.0