From patchwork Sat Oct 22 07:23:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7372 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1096046wrr; Sat, 22 Oct 2022 01:04:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Emy4QopxX1cnZLqKcm0kNAJCa9U7ThjcXve0v028H9sE9B8rBKBVtnxuY/wjRVOuuNXKw X-Received: by 2002:a62:ee0c:0:b0:558:5c4:97dc with SMTP id e12-20020a62ee0c000000b0055805c497dcmr23391338pfi.14.1666425851467; Sat, 22 Oct 2022 01:04:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666425851; cv=none; d=google.com; s=arc-20160816; b=ozWo9LREbo2S3Q63L92FlER4h3ijkV0whO20o4rcWylVOLMiN0miSAdJhRqTDZe3LS POl0U75AeG3cK9k8aFRPNAiLZnzBVYTOrCuYgjy9/YSjWE/VuNsm2qFdkZ40Z/ologQ6 byTkUb1plAtQmptHmcI7lEDe24Zsma2OMsdt7/1SinlcfiZ/J9d3i9XV9+6v+BiAPSFo kVJdMypQTRZh/PWEMKchYqhuDd88+CJl6Q+4WuxnycDjYZJOCUS72nVYpEb+CM8Zjr6j xa3K6Gifb3EOG1cgZtPnVqZT6ZaLaA7Um8a0P4b4AW/ik9E6gNw/PaU/iNRjBqGsK/yq cX9w== 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=XJw7hRf7v7CYsVI12yQlkPPQK1t6Rjzos+P+WdCGH1w=; b=oehyaLjaYETE7YMdkXpJl41PgMXf2XPglHGrk9+pG8PEmJq6g9FqPbqddd3J4aFxsV j6lYn3D/7FDu1jzuuD52lV/+483KQjLwhhgVFb9lPjGTRgcccFWlaYdOBhqS7AJrmvpm vpaJKn05mkv1YRpoktzUDtJBN/eK5Dm013aZh+SUWd4/cD5OBgqCijBPdL9Lo4JPYJDl IWHFQZzS5XU+9Mw9SHH7dftylOZ8kAlWbImTPV8fFibBqZIwxCcQUSMvsPEfXThtfGwW Gj9kvpZsr1OCHZ1nGUhB9KJH/0Fq+xJg3Dg+snB1HWWxdGGH4kPIzaSLj4GPQOaNbgkX EmGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZZ1fVqY7; 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 t6-20020a17090ad50600b0020ab20c54fesi1989305pju.114.2022.10.22.01.03.57; Sat, 22 Oct 2022 01:04:11 -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=ZZ1fVqY7; 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 S232663AbiJVIDi (ORCPT + 99 others); Sat, 22 Oct 2022 04:03:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232159AbiJVHzv (ORCPT ); Sat, 22 Oct 2022 03:55:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50EBE108DCE; Sat, 22 Oct 2022 00:48:26 -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 ams.source.kernel.org (Postfix) with ESMTPS id 8497DB82DF1; Sat, 22 Oct 2022 07:47:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1A07C433D6; Sat, 22 Oct 2022 07:47:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424876; bh=Gdu8FkS/FwQ0ued/QFrnPBGMV5XAprYfU7DZMznsFag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZZ1fVqY7WBzNjKlsHxU6NP/lw4fclO0p2fHoG9C9UgrhHbzTwqg3CNw+O6MJURtkD XTGBbDnHFlXLxjbelh0fBSLUsb9HK1tELTOrZA3DHahsl4+gz3dZkLltCzlfGWwDC9 sQH1PwRvvZn77lHkPJhvCGFYmts+InbuD4yslMI8= 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 5.19 310/717] ASoC: soc-pcm.c: call __soc_pcm_close() in soc_pcm_close() Date: Sat, 22 Oct 2022 09:23:09 +0200 Message-Id: <20221022072507.380977444@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747374153628146336?= X-GMAIL-MSGID: =?utf-8?q?1747374153628146336?= 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 0c1de5624842..6359d00b7bda 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; }