From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93F1A21C16A; Tue, 16 Jun 2026 17:29:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630991; cv=none; b=DZpTMjRIryVkOnKdFjZkO4q5y1z4IoQdlK0Rv3XKoeg4uF8UheyeDGmrZ+tlTILQ8BX/Ce9wWDROLldL1KkUv3w+No9xBLDkphIM0bvemWk4VNDYI33b4NU16/f7hG2vFihbnyQVSL6PFCAwbr0J5s6CzsVXSJXKnHBS2038v3E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630991; c=relaxed/simple; bh=QLVnKg8tNe9bs5op6vEh36as3pncakk0RCwCUKs7Wc8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ei4IWxHBg4RaKxqCcQHonQzn8jseP+XggZ2lp3Lzb3tY7aLc5vjd4VUDlSnAGFlsvKI7DNsNSNFK8O3N0iAv07Zd8/wiKVjb8CGKh2NZGhRx3IJgX8mZpSmhosMOr089JpcZlkMeYVI/abtiGzM9teHiJJXT9h8PEd9j9N3WQXg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vzng1JH8; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Vzng1JH8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 969B51F000E9; Tue, 16 Jun 2026 17:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781630990; bh=71hsCm88KSMTU+WVgLijdxPpH+kQojSqhqTO6OdJ7wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Vzng1JH83O7ph0xzp2YJ6LyS0YY8VG9hpdmbbalR8paQv4ShpOTC3zRz37hHQaQ8k +HU0+WErmTaoRFhdfTkNdDycLMyBd3MtbxYBm+hx2VG7VpPz01++w/EBRdKQKJodny HTYWglC/PNmSU27c63veyC/xQ8qGWmAHDOTa3h3k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stable@vger.kernel.org, Srinivas Kandagatla , Mark Brown Subject: [PATCH 6.1 134/522] ASoC: qcom: q6asm-dai: close stream only when running Date: Tue, 16 Jun 2026 20:24:41 +0530 Message-ID: <20260616145132.376863803@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Srinivas Kandagatla commit 048c540ee76ded666bda74f9dae1ca3254e0633c upstream. q6asm_dai_close() and q6asm_dai_compr_free() currently issue CMD_CLOSE whenever prtd->state is non-zero. After prepare() closes an existing stream, the state is updated to Q6ASM_STREAM_STOPPED. Since this state is also non-zero, the close and free paths can send CMD_CLOSE again for a stream that has already been closed. Restrict CMD_CLOSE to the Q6ASM_STREAM_RUNNING state so the command is sent only when the ASM stream is still active. Fixes: 2a9e92d371db ("ASoC: qdsp6: q6asm: Add q6asm dai driver") Cc: Stable@vger.kernel.org Signed-off-by: Srinivas Kandagatla Link: https://patch.msgid.link/20260518092347.3446946-3-srinivas.kandagatla@oss.qualcomm.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/qcom/qdsp6/q6asm-dai.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -456,12 +456,12 @@ static int q6asm_dai_close(struct snd_so struct q6asm_dai_rtd *prtd = runtime->private_data; if (prtd->audio_client) { - if (prtd->state) + if (prtd->state == Q6ASM_STREAM_RUNNING) { q6asm_cmd(prtd->audio_client, prtd->stream_id, CMD_CLOSE); - - q6asm_unmap_memory_regions(substream->stream, + q6asm_unmap_memory_regions(substream->stream, prtd->audio_client); + } q6asm_audio_client_free(prtd->audio_client); prtd->audio_client = NULL; } @@ -678,7 +678,7 @@ static int q6asm_dai_compr_free(struct s struct snd_soc_pcm_runtime *rtd = stream->private_data; if (prtd->audio_client) { - if (prtd->state) { + if (prtd->state == Q6ASM_STREAM_RUNNING) { q6asm_cmd(prtd->audio_client, prtd->stream_id, CMD_CLOSE); if (prtd->next_track_stream_id) { @@ -686,11 +686,11 @@ static int q6asm_dai_compr_free(struct s prtd->next_track_stream_id, CMD_CLOSE); } - } - snd_dma_free_pages(&prtd->dma_buffer); - q6asm_unmap_memory_regions(stream->direction, + q6asm_unmap_memory_regions(stream->direction, prtd->audio_client); + } + snd_dma_free_pages(&prtd->dma_buffer); q6asm_audio_client_free(prtd->audio_client); prtd->audio_client = NULL; }