patch "misc: genwqe: Fixes DMA mask setting" added to char-misc-linus
This is a note to let you know that I've just added the patch titled
misc: genwqe: Fixes DMA mask setting
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From 8d753db5c227d1f403c4bc9cae4ae02c862413cd Mon Sep 17 00:00:00 2001
From: Christophe JAILLET <[email protected]>
Date: Wed, 8 Sep 2021 21:55:56 +0200
Subject: misc: genwqe: Fixes DMA mask setting
Commit 505b08777d78 ("misc: genwqe: Use dma_set_mask_and_coherent to simplify code") changed the logic in the code.
Instead of a ||, a && should have been used to keep the code the same.
--- drivers/misc/genwqe/card_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/genwqe/card_base.c +1 -1
@@ -1090,7 +1090,7 @@ static int genwqe_pci_setup(struct genwqe_dev *cd)/* check for 64-bit DMA address supported (DAC) */ /* check for 32-bit DMA address supported (SAC) */ -if (dma_set_mask_and_coherent (&pci_dev->dev,DMA_BIT_MASK (64 )) || +if (dma_set_mask_and_coherent (&pci_dev->dev,DMA_BIT_MASK (64 )) &&dma_set_mask_and_coherent (&pci_dev->dev,DMA_BIT_MASK (32 ))) {dev_err (&pci_dev->dev,"err: neither DMA32 nor DMA64 supported\n" );
Signature · 1 line
2.33.0