diff options
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 4 | ||||
-rw-r--r-- | drivers/message/i2o/memory.c | 2 | ||||
-rw-r--r-- | drivers/message/i2o/pci.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 98026016a935..d0d126c69354 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -1539,8 +1539,8 @@ mpt_mapresources(MPT_ADAPTER *ioc) | |||
1539 | dinitprintk(ioc, printk(MYIOC_s_INFO_FMT | 1539 | dinitprintk(ioc, printk(MYIOC_s_INFO_FMT |
1540 | ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n", | 1540 | ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n", |
1541 | ioc->name)); | 1541 | ioc->name)); |
1542 | } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK) | 1542 | } else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) |
1543 | && !pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) { | 1543 | && !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) { |
1544 | dinitprintk(ioc, printk(MYIOC_s_INFO_FMT | 1544 | dinitprintk(ioc, printk(MYIOC_s_INFO_FMT |
1545 | ": 32 BIT PCI BUS DMA ADDRESSING SUPPORTED\n", | 1545 | ": 32 BIT PCI BUS DMA ADDRESSING SUPPORTED\n", |
1546 | ioc->name)); | 1546 | ioc->name)); |
diff --git a/drivers/message/i2o/memory.c b/drivers/message/i2o/memory.c index 9a08d8e45516..292b41e49fbd 100644 --- a/drivers/message/i2o/memory.c +++ b/drivers/message/i2o/memory.c | |||
@@ -187,7 +187,7 @@ int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len) | |||
187 | mutex_lock(&mem_lock); | 187 | mutex_lock(&mem_lock); |
188 | if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_BIT_MASK(64))) { | 188 | if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_BIT_MASK(64))) { |
189 | dma_64 = 1; | 189 | dma_64 = 1; |
190 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 190 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { |
191 | mutex_unlock(&mem_lock); | 191 | mutex_unlock(&mem_lock); |
192 | return -ENOMEM; | 192 | return -ENOMEM; |
193 | } | 193 | } |
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index ed17ac5af3e0..35ba2ae38b42 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
@@ -334,7 +334,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
334 | return rc; | 334 | return rc; |
335 | } | 335 | } |
336 | 336 | ||
337 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 337 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { |
338 | printk(KERN_WARNING "i2o: no suitable DMA found for %s\n", | 338 | printk(KERN_WARNING "i2o: no suitable DMA found for %s\n", |
339 | pci_name(pdev)); | 339 | pci_name(pdev)); |
340 | rc = -ENODEV; | 340 | rc = -ENODEV; |