From patchwork Wed Oct 19 08:27:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5450 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp329088wrs; Wed, 19 Oct 2022 06:32:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6DmxQcPWaAkOIxHt7OS72SeqDbA+gpeIyF9JpxLVQ2gYO6xxnqmGo9/d8CJdNLPbGHv49Q X-Received: by 2002:a63:a548:0:b0:462:9d00:1835 with SMTP id r8-20020a63a548000000b004629d001835mr7167636pgu.442.1666186329440; Wed, 19 Oct 2022 06:32:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666186329; cv=none; d=google.com; s=arc-20160816; b=goMkDVDg/htCEU76ISgU+K9Tr2Q61CgX3dVlAhaRe1e6zAzSxqFwcsLsR7lBtgyhCg dpF3w4Atv6KWqj3tcUuvb1ybSAlsACF9fJxj7RLpGWuD1TKHdjqHc5VIQ1aj6aFr+X3D Xck/4uGD/UsKS0fUdiXjJnq+smjgRi2lEeUSPU0RqBnRiMntAT/8HS2K7btFzmim0nU2 KvUnc7vK762rT4Mln/nEsGysOQLNylayYvQgs0NkhsU2P2PQq2O8a+ik70QaXvy6Ci0v z+yib4iPoTfhxbH0b9SLU43FhcFtEb/rmDDWOR88NiaiNt8LGd3c4SrVc0scLt2O1vYr aOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0KlOagNHArhGUifN6pvssoV9t+D4TWkPDyuuHBpUNKI=; b=mNFAdwWgXJJ0z09cinvkGOSI8nc1nMhVW45DQZkI2uw/tAr0MktATPShxBYlcowoNz BJh1flo9sABNzKzCmWppGEOAiBFBw3Wj78vQ6FfdhsUiER96qw+cfC/abN7aJchIxpUY +3AO+3/W6QKmqq69RoExNAbA3CGzm5sBTYhhaUEdH+HFiqd/66ptaP1RJJljJJBFzbKU dWgwE3BWJZnmlDDToscMmBFz+EpkmA1eG/inDDXk8Cv/LaykSWEG53TsTQgK4HIEaLHO X3srgH3u8GXHXKXP4yb1FZhkAQ+Agrk7Hu35xjPkzs1ZzXh5P8TYMkCR0iTaAhgHHYUv pB6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QTLWOc7W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w6-20020a170902d3c600b0017f908814c6si16932286plb.532.2022.10.19.06.31.53; Wed, 19 Oct 2022 06:32:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QTLWOc7W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231614AbiJSNSa (ORCPT + 99 others); Wed, 19 Oct 2022 09:18:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230433AbiJSNSF (ORCPT ); Wed, 19 Oct 2022 09:18:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 706FA44CF6; Wed, 19 Oct 2022 06:03:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 40FBC617EE; Wed, 19 Oct 2022 08:54:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53078C433C1; Wed, 19 Oct 2022 08:54:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169679; bh=bjghNFUN8jBz1a4YSmN/FBTEzv7bkSZjtgRMXepanqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QTLWOc7WyoqaDCI9HX0UQbzUyRzCAZMlCo52X2TFpmK8sFDk5yqeCu3q+YTtdr7JI tPxPrcXOKKqP0TwAHaSxQUSpUyOojKBF4kq8x7YHdO8vgs+WtbXDk+JpNokFKUhEso IfHydGhyptGPVsF/toZVKUZi6BBpVphTQrKqbHpk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai , Kuninori Morimoto , Mark Brown , Sasha Levin Subject: [PATCH 6.0 367/862] ASoC: soc-pcm.c: call __soc_pcm_close() in soc_pcm_close() Date: Wed, 19 Oct 2022 10:27:34 +0200 Message-Id: <20221019083306.218104526@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747122996459145135?= X-GMAIL-MSGID: =?utf-8?q?1747122996459145135?= From: Kuninori Morimoto [ Upstream commit 6bbabd28805f36baf6d0f3eb082db032a638f612 ] commit b7898396f4bbe16 ("ASoC: soc-pcm: Fix and cleanup DPCM locking") added __soc_pcm_close() for non-lock version of soc_pcm_close(). But soc_pcm_close() is not using it. It is no problem, but confusable. static int __soc_pcm_close(...) { => return soc_pcm_clean(rtd, substream, 0); } static int soc_pcm_close(...) { ... snd_soc_dpcm_mutex_lock(rtd); => soc_pcm_clean(rtd, substream, 0); snd_soc_dpcm_mutex_unlock(rtd); return 0; } This patch use it. Fixes: b7898396f4bbe16 ("ASoC: soc-pcm: Fix and cleanup DPCM locking") Cc: Takashi Iwai Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/87czctgg3w.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 4f60c0a83311..4d9b91e7e14f 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -723,7 +723,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); snd_soc_dpcm_mutex_lock(rtd); - soc_pcm_clean(rtd, substream, 0); + __soc_pcm_close(rtd, substream); snd_soc_dpcm_mutex_unlock(rtd); return 0; }