Commit c326de56 authored Feb 18, 2019 by Hannes Reinecke Committed by Martin K. Petersen Feb 25, 2019

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: 3a21986f ("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>

parent 1feb3b02

drivers/scsi/aic94xx/aic94xx_init.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -769,9 +769,11 @@ static int asd_pci_probe(struct pci_dev dev, const struct pci_device_id id)
		if (err)
		goto Err_remove;

		err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64));
		if (err)
		err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
		if (err) {
		err = -ENODEV;
		if (dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(64)) \|\|
		dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32))) {
		asd_printk("no suitable DMA mask for %s\n", pci_name(dev));
		goto Err_remove;
		}