Merge branch 'for-2.6.30' into for-2.6.31

[mv-sheeva.git] / drivers / scsi / stex.c

diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 7cb8063c43554d435acb44d64684c6944c842327..8d2a95c4e5b56af930c46a76d760e53a9c9931a9 100644 (file)
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1398,9 +1398,9 @@ static int stex_set_dma_mask(struct pci_dev * pdev)
        if (!pci_set_dma_mask(pdev,  DMA_BIT_MASK(64))
                && !pci_set_consistent_dma_mask(pdev,  DMA_BIT_MASK(64)))
                return 0;
-       ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+       ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
        if (!ret)
-               ret = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+               ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
        return ret;
 }