Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1feb3b02 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: 3w-sas: 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.

Fixes: b1fa1229 ("scsi: 3w-sas: fully convert to the generic DMA API")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 33d66674

drivers/scsi/3w-sas.c

+8 −4
Original line number Diff line number Diff line
@@ -1572,8 +1572,10 @@ static int twl_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) 
	pci_set_master(pdev);

	pci_try_set_mwi(pdev);



	if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||

	    dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {

	retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (retval)

		retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (retval) {

		TW_PRINTK(host, TW_DRIVER, 0x18, "Failed to set dma mask");

		retval = -ENODEV;

		goto out_disable_device;
@@ -1804,8 +1806,10 @@ static int twl_resume(struct pci_dev *pdev) 
	pci_set_master(pdev);

	pci_try_set_mwi(pdev);



	if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||

	    dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {

	retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (retval)

		retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (retval) {

		TW_PRINTK(host, TW_DRIVER, 0x25, "Failed to set dma mask during resume");

		retval = -ENODEV;

		goto out_disable_device;