diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-03-20 10:08:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-30 09:35:15 +0200 |
| commit | ed00b613bbcb7af32fbdd87e3c985c00e2c9c5a3 (patch) | |
| tree | 12a899dba32cf14a32a18fd2a5f7af58b17d6130 | |
| parent | b55ffcb1bc8a9c40db928f568ef61016ac681c29 (diff) | |
| download | linux-stable-ed00b613bbcb7af32fbdd87e3c985c00e2c9c5a3.tar.gz linux-stable-ed00b613bbcb7af32fbdd87e3c985c00e2c9c5a3.tar.bz2 linux-stable-ed00b613bbcb7af32fbdd87e3c985c00e2c9c5a3.zip | |
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")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/pci/ctxfi/cthw20k1.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |