From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E07B63EFAE6; Sat, 28 Feb 2026 17:42:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300532; cv=none; b=hpFvgGgtZTaMs4hrjstsF0P/5VPbkrEUhXsnsSzfK67eeg9zokB6uag98V6nAKQBCXkqgM1iBWOPWg+gnuSSO1U/IdfB8/GFd+WWodsOlrkZyLZ5YkTF6WjRyXwxRlX21ZuT/tQLOIZ57wEYqAmhU2tBElrjslnY4abOz4lSDBY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300532; c=relaxed/simple; bh=/4+hOPyePWoc2cQ7a3fOGo9JpaAr/zRNdwQUmgjfWPg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i58OciNUDV2G8iz/TL96HXkh1lfK1iXWtjAVpLB6tMHJyZbUH1HpQ/26D2U3QeJOhyi1YJA70SHGg7NYpSocWdLxDY/wY2Codh1jyizrZNsshVqciercYx74pSq7wFz8QwCJTtDu0QYL3uOBL+bMK1iuKCO166ndYLeEHSZYeFg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OMMiBrfO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OMMiBrfO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36F07C19424; Sat, 28 Feb 2026 17:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300531; bh=/4+hOPyePWoc2cQ7a3fOGo9JpaAr/zRNdwQUmgjfWPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OMMiBrfOs72CVPScdT8F5ZCaFNvLF9Q72ceaPT0Y8MBGCrPa/cIyHkO6OLbz3AFBW 9EkHXZS0MyMrkLYhEGaZ0RSqr7L+ojYhhPTRFFgTtLuq4MXcmq8TBsG1orkI5+13Su 3E9psntXfhax1YwreEQHG3vTrTKB7W2FpVxxQmwA0f36xIZVd81pyaUokwO5YE+ntt 3F5WVHyMpWnBRU8tIQg8gKtasiyvHuVEUkOV2UEkL111nML46CFPVZ1vcSGo4b65WC jHm4Fae8FhTLsPJ8HNVo5BaQIesAKO42jdQWUEN/Qm6+Tf+dwf+Q1nZTQyg/XbjI6R gzPMoIt4uPP8g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Haoxiang Li , Hans Verkuil , Sasha Levin Subject: [PATCH 6.19 571/844] media: cx88: Add missing unmap in snd_cx88_hw_params() Date: Sat, 28 Feb 2026 12:28:04 -0500 Message-ID: <20260228173244.1509663-572-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Haoxiang Li [ Upstream commit dbc527d980f7ba8559de38f8c1e4158c71a78915 ] In error path, add cx88_alsa_dma_unmap() to release resource acquired by cx88_alsa_dma_map(). Fixes: b2c75abde0de ("[media] cx88: drop videobuf abuse in cx88-alsa") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/pci/cx88/cx88-alsa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c index 29fb1311e4434..4e574d8390b4d 100644 --- a/drivers/media/pci/cx88/cx88-alsa.c +++ b/drivers/media/pci/cx88/cx88-alsa.c @@ -483,8 +483,10 @@ static int snd_cx88_hw_params(struct snd_pcm_substream *substream, ret = cx88_risc_databuffer(chip->pci, &buf->risc, buf->sglist, chip->period_size, chip->num_periods, 1); - if (ret < 0) + if (ret < 0) { + cx88_alsa_dma_unmap(chip); goto error; + } /* Loop back to start of program */ buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC); -- 2.51.0