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 C6ACBC4332F for ; Wed, 2 Mar 2022 10:04:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240829AbiCBKFC (ORCPT ); Wed, 2 Mar 2022 05:05:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238673AbiCBKEx (ORCPT ); Wed, 2 Mar 2022 05:04:53 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7010A60068 for ; Wed, 2 Mar 2022 02:04:07 -0800 (PST) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 2F4CD21997; Wed, 2 Mar 2022 10:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1646215446; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0UqB3yDUtjR1RM9tw+84pX8CfDY4K3FJ3p+AZkVtHJw=; b=OFrJHNio1gs2aReQXoKhtYER9CyLiQLvXcosjdppD578PgPQLJ5OVIAUW0k4fTUXfUZ88F FkJiSxBEkBEhXmMpGbB3qdKIFTNo3wUFZRvwuOzVvrP50/78POMr5BqArrX7ALWcPecPfv ZAqMsATANAKOci4Ig7PUqjUuPqZ7Twk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1646215446; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0UqB3yDUtjR1RM9tw+84pX8CfDY4K3FJ3p+AZkVtHJw=; b=rxG6Eeqk8qJgRMuMlO6TS6CvYCBT+ne+bR7jsooRnBZqeM0dwf+FmKP4TqQZ2dY3kXM5PI kaM6J0WWhz5BorBg== Received: from alsa1.suse.de (alsa1.suse.de [10.160.4.42]) by relay2.suse.de (Postfix) with ESMTP id 22A91A3B81; Wed, 2 Mar 2022 10:04:06 +0000 (UTC) Date: Wed, 02 Mar 2022 11:04:06 +0100 Message-ID: From: Takashi Iwai To: Zhen Ni Cc: frattaroli.nicolas@gmail.com, lgirdwood@gmail.com, broonie@kernel.org, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ASoC: rockchip: i2s_tdm: fix runtime pm imbalance on error In-Reply-To: <20220302100019.22891-1-nizhen@uniontech.com> References: <20220302100019.22891-1-nizhen@uniontech.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 02 Mar 2022 11:00:19 +0100, Zhen Ni wrote: > > pm_runtime_get_sync() increments the runtime PM usage counter even the > call returns an error code. Thus a pairing decrement is needed on the > error handling path to keep the counter balanced. > > Signed-off-by: Zhen Ni Better to use a new function pm_runtime_resume_and_get(). thanks, Takashi > --- > sound/soc/rockchip/rockchip_i2s_tdm.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c > index 5f9cb5c4c7f0..4691a76b499d 100644 > --- a/sound/soc/rockchip/rockchip_i2s_tdm.c > +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c > @@ -1739,8 +1739,10 @@ static int __maybe_unused rockchip_i2s_tdm_resume(struct device *dev) > int ret; > > ret = pm_runtime_get_sync(dev); > - if (ret < 0) > + if (ret < 0) { > + pm_runtime_put(dev); > return ret; > + } > ret = regcache_sync(i2s_tdm->regmap); > pm_runtime_put(dev); > > -- > 2.20.1 > > >