aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@nuerscht.ch>2005-06-25 14:59:27 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 16:25:09 -0700
commit4f11842ebbb3b98a88c38ef6c18345ccc792a54b (patch)
tree5bd60dea33e7d30ce0ac4c4ec9c64583ee6bacec
parent738c7b4f7f36ce2c547d0a2c2aa397aae904510f (diff)
downloadmrst-s0i3-test-4f11842ebbb3b98a88c38ef6c18345ccc792a54b.tar.gz
mrst-s0i3-test-4f11842ebbb3b98a88c38ef6c18345ccc792a54b.tar.xz
mrst-s0i3-test-4f11842ebbb3b98a88c38ef6c18345ccc792a54b.zip
[PATCH] sound/oss/cmpci: Use the DMA_32BIT_MASK constant
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 <tklauser@nuerscht.ch> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--sound/oss/cmpci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index 34720e66dae..74dcca78c6c 100644
--- a/sound/oss/cmpci.c
+++ b/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_dev *pcidev, const struct pci_device_id
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;