Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: aic94xx: fix calls to dma_set_mask_and_coherent()

The change to use dma_set_mask_and_coherent() incorrectly made a second
call with the 32 bit DMA mask value when the call with the 64 bit DMA mask
value succeeded.

[mkp: fixed subject]

Fixes: 3a21986f1a59 ("scsi: aic94xx: fully convert to the generic DMA API")
Cc: <stable@vger.kernel.org>
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Hannes Reinecke and committed by
Martin K. Petersen
c326de56 1feb3b02

+5 -3
+5 -3
drivers/scsi/aic94xx/aic94xx_init.c
··· 769 769 if (err) 770 770 goto Err_remove; 771 771 772 - err = -ENODEV; 773 - if (dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64)) || 774 - dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32))) { 772 + err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64)); 773 + if (err) 774 + err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32)); 775 + if (err) { 776 + err = -ENODEV; 775 777 asd_printk("no suitable DMA mask for %s\n", pci_name(dev)); 776 778 goto Err_remove; 777 779 }