scsi: csiostor: 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: c22b332d811b ("scsi: csiostor: switch to 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>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index cf629380a981..616b25bf7941 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -210,8 +210,11 @@ csio_pci_init(struct pci_dev *pdev, int *bars)
         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))) {
+        rv = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+        if (rv)
+                rv = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+        if (rv) {
+                rv = -ENODEV;
                 dev_err(&pdev->dev, "No suitable DMA available.\n");
                 goto err_release_regions;
         }