| From f363a06642f28caaa78cb6446bbad90c73fe183c Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Mon, 20 Mar 2017 10:08:19 +0100 |
| Subject: [PATCH] ALSA: ctxfi: Fix the incorrect check of dma_set_mask() call |
| |
| 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") |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| |
| diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c |
| index ab4cdab5cfa5..79edd88d5cd0 100644 |
| --- a/sound/pci/ctxfi/cthw20k1.c |
| +++ b/sound/pci/ctxfi/cthw20k1.c |
| @@ -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)); |
| -- |
| 2.12.0 |
| |
