2005-05-28 23:25:10

by Domen Puncer

[permalink] [raw]
Subject: [patch 4/7] sound/oss/cmpci: Use the DMA_32BIT_MASK constant

From: Tobias Klauser <[email protected]>


Use the DMA_32BIT_MASK constant from dma-mapping.h
when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <[email protected]>
Signed-off-by: Domen Puncer <[email protected]>

---
cmpci.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)

Index: quilt/sound/oss/cmpci.c
===================================================================
--- quilt.orig/sound/oss/cmpci.c
+++ quilt/sound/oss/cmpci.c
@@ -123,6 +123,7 @@
#include <linux/smp_lock.h>
#include <linux/bitops.h>
#include <linux/wait.h>
+#include <linux/dma-mapping.h>

#include <asm/io.h>
#include <asm/page.h>
@@ -3058,7 +3059,7 @@ static int __devinit cm_probe(struct pci
return -ENODEV;
if (pcidev->irq == 0)
return -ENODEV;
- i = pci_set_dma_mask(pcidev, 0xffffffff);
+ i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
if (i) {
printk(KERN_WARNING "cmpci: architecture does not support 32bit PCI busmaster DMA\n");
return i;

--