aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@nuerscht.ch>2005-06-25 17:59:27 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 19:25:09 -0400
commit4f11842ebbb3b98a88c38ef6c18345ccc792a54b (patch)
tree5bd60dea33e7d30ce0ac4c4ec9c64583ee6bacec
parent738c7b4f7f36ce2c547d0a2c2aa397aae904510f (diff)
[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 34720e66dae1..74dcca78c6c0 100644
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -123,6 +123,7 @@
123#include <linux/smp_lock.h> 123#include <linux/smp_lock.h>
124#include <linux/bitops.h> 124#include <linux/bitops.h>
125#include <linux/wait.h> 125#include <linux/wait.h>
126#include <linux/dma-mapping.h>
126 127
127#include <asm/io.h> 128#include <asm/io.h>
128#include <asm/page.h> 129#include <asm/page.h>
@@ -3058,7 +3059,7 @@ static int __devinit cm_probe(struct pci_dev *pcidev, const struct pci_device_id
3058 return -ENODEV; 3059 return -ENODEV;
3059 if (pcidev->irq == 0) 3060 if (pcidev->irq == 0)
3060 return -ENODEV; 3061 return -ENODEV;
3061 i = pci_set_dma_mask(pcidev, 0xffffffff); 3062 i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
3062 if (i) { 3063 if (i) {
3063 printk(KERN_WARNING "cmpci: architecture does not support 32bit PCI busmaster DMA\n"); 3064 printk(KERN_WARNING "cmpci: architecture does not support 32bit PCI busmaster DMA\n");
3064 return i; 3065 return i;