aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/sx8.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 5ed3a6379452..9db0a9e3e59c 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -26,6 +26,7 @@
26#include <linux/delay.h> 26#include <linux/delay.h>
27#include <linux/time.h> 27#include <linux/time.h>
28#include <linux/hdreg.h> 28#include <linux/hdreg.h>
29#include <linux/dma-mapping.h>
29#include <asm/io.h> 30#include <asm/io.h>
30#include <asm/semaphore.h> 31#include <asm/semaphore.h>
31#include <asm/uaccess.h> 32#include <asm/uaccess.h>
@@ -1582,9 +1583,9 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1582 goto err_out; 1583 goto err_out;
1583 1584
1584#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */ 1585#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */
1585 rc = pci_set_dma_mask(pdev, 0xffffffffffffffffULL); 1586 rc = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
1586 if (!rc) { 1587 if (!rc) {
1587 rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL); 1588 rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
1588 if (rc) { 1589 if (rc) {
1589 printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n", 1590 printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n",
1590 pci_name(pdev)); 1591 pci_name(pdev));
@@ -1593,7 +1594,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1593 pci_dac = 1; 1594 pci_dac = 1;
1594 } else { 1595 } else {
1595#endif 1596#endif
1596 rc = pci_set_dma_mask(pdev, 0xffffffffULL); 1597 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
1597 if (rc) { 1598 if (rc) {
1598 printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n", 1599 printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n",
1599 pci_name(pdev)); 1600 pci_name(pdev));