Skip to contentSkip to conversation

Patch "ALSA: ctxfi: Fix the incorrect check of dma_set_mask() call" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Mar 27, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ALSA: ctxfi: Fix the incorrect check of dma_set_mask() call

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
alsa-ctxfi-fix-the-incorrect-check-of-dma_set_mask-call.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f363a06642f28caaa78cb6446bbad90c73fe183c Mon Sep 17 00:00:00 2001

From: Takashi Iwai <[email protected]>
Date: Mon, 20 Mar 2017 10:08:19 +0100
Subject: ALSA: ctxfi: Fix the incorrect check of dma_set_mask() call

From: Takashi Iwai <[email protected]>

commit f363a06642f28caaa78cb6446bbad90c73fe183c upstream.

In the commit [15c75b09f8d1: ALSA: ctxfi: Fallback DMA mask to 32bit], I forgot to put "!" at dam_set_mask() call check in cthw20k1.c (while cthw20k2.c is OK). This patch fixes that obvious bug.

(As a side note: although the original commit was completely wrong,
it's still working for most of machines, as it sets to 32bit DMA mask in the end. So the bug severity is low.)

Fixes 15c75b09f8d1 ("ALSA: ctxfi: Fallback DMA mask to 32bit")
---
 sound/pci/ctxfi/cthw20k1.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/ctxfi/cthw20k1.c +1 -1
@@ -1905,7 +1905,7 @@ static int hw_card_start(struct hw *hw)
 		return err;
 
 	/* Set DMA transfer mask */
-	if (dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {
+	if (!dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {
 		dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(dma_bits));
 	} else {
 		dma_set_mask(&pci->dev, DMA_BIT_MASK(32));

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/alsa-ctxfi-fix-the-incorrect-check-of-dma_set_mask-call.patch queue-4.4/alsa-hda-adding-a-group-of-pin-definition-to-fix-headset-problem.patch queue-4.4/alsa-seq-fix-racy-cell-insertions-during-snd_seq_pool_done.patch