diff options
author | Tobias Klauser <tklauser@nuerscht.ch> | 2005-06-25 17:59:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:25:08 -0400 |
commit | 738c7b4f7f36ce2c547d0a2c2aa397aae904510f (patch) | |
tree | 8e7ca4fd4019cca4d0bc1f538186c6d228391597 | |
parent | 3ee538a2e867c7fbdb2a5940b610682d5d08e8be (diff) |
[PATCH] sound/oss/es1370: 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/es1370.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/oss/es1370.c b/sound/oss/es1370.c index 056091cff266..886f61c1c34a 100644 --- a/sound/oss/es1370.c +++ b/sound/oss/es1370.c | |||
@@ -156,6 +156,7 @@ | |||
156 | #include <linux/spinlock.h> | 156 | #include <linux/spinlock.h> |
157 | #include <linux/gameport.h> | 157 | #include <linux/gameport.h> |
158 | #include <linux/wait.h> | 158 | #include <linux/wait.h> |
159 | #include <linux/dma-mapping.h> | ||
159 | 160 | ||
160 | #include <asm/io.h> | 161 | #include <asm/io.h> |
161 | #include <asm/page.h> | 162 | #include <asm/page.h> |
@@ -2569,7 +2570,7 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic | |||
2569 | return -ENODEV; | 2570 | return -ENODEV; |
2570 | if (pcidev->irq == 0) | 2571 | if (pcidev->irq == 0) |
2571 | return -ENODEV; | 2572 | return -ENODEV; |
2572 | i = pci_set_dma_mask(pcidev, 0xffffffff); | 2573 | i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK); |
2573 | if (i) { | 2574 | if (i) { |
2574 | printk(KERN_WARNING "es1370: architecture does not support 32bit PCI busmaster DMA\n"); | 2575 | printk(KERN_WARNING "es1370: architecture does not support 32bit PCI busmaster DMA\n"); |
2575 | return i; | 2576 | return i; |