From nobody Thu Dec 18 13:00:11 2025 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 0F8D3C32774 for ; Tue, 23 Aug 2022 08:19:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242691AbiHWITl (ORCPT ); Tue, 23 Aug 2022 04:19:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242522AbiHWIP2 (ORCPT ); Tue, 23 Aug 2022 04:15:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1908D6D57D; Tue, 23 Aug 2022 01:10:13 -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 14F5DB81C23; Tue, 23 Aug 2022 08:10:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E8F6C433D6; Tue, 23 Aug 2022 08:10:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661242210; bh=pjkEizbC1JCRLj2o9AxXBiGOjqN01mRAxYEHVJUGgas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dn3J0zKcPUAoxf2JhdZKNgXdCwONYiXl7ye5JUKOC6ghmBFCiHx8B+uOE8TanAMxW MI+M25iyO1gSKXtBnswe4JLiKnToWRckn50Geyvk2dEpFiQgpH/48IsQdn0SIe/0Fe coTg8U0abGhrPNznw8HMajkw4ocF81gAiTulzaI4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivasa Rao Mandadapu , Srinivas Kandagatla , Mark Brown Subject: [PATCH 5.19 077/365] ASoC: qdsp6: q6apm-dai: unprepare stream if its already prepared Date: Tue, 23 Aug 2022 09:59:38 +0200 Message-Id: <20220823080121.409659939@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla commit 6548c884a595391fab172faeae39e2b329b848f3 upstream. prepare callback can be called multiple times, so unprepare the stream if its already prepared. Without this DSP is not happy to setting the params on a already prepared graph. Fixes: 9b4fe0f1cd79 ("ASoC: qdsp6: audioreach: add q6apm-dai support") Reported-by: Srinivasa Rao Mandadapu Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20220610144818.511797-1-srinivas.kandagatla= @linaro.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/qcom/qdsp6/q6apm-dai.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -153,6 +153,12 @@ static int q6apm_dai_prepare(struct snd_ q6apm_unmap_memory_regions(prtd->graph, substream->stream); } =20 + if (prtd->state) { + /* clear the previous setup if any */ + q6apm_graph_stop(prtd->graph); + q6apm_unmap_memory_regions(prtd->graph, substream->stream); + } + prtd->pcm_count =3D snd_pcm_lib_period_bytes(substream); prtd->pos =3D 0; /* rate and channels are sent to audio driver */