aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@nuerscht.ch>2005-06-25 17:59:26 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 19:25:08 -0400
commit3ee538a2e867c7fbdb2a5940b610682d5d08e8be (patch)
tree104a6e111df21d28f070d36ed3894289a84d2e5d
parentcaac3a444ce3b5a8d76069abfbb699d2a65b3f09 (diff)
[PATCH] sound/oss/es1371: 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/es1371.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index a50fddaeea21..9266b777387b 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -128,6 +128,7 @@
128#include <linux/ac97_codec.h> 128#include <linux/ac97_codec.h>
129#include <linux/gameport.h> 129#include <linux/gameport.h>
130#include <linux/wait.h> 130#include <linux/wait.h>
131#include <linux/dma-mapping.h>
131 132
132#include <asm/io.h> 133#include <asm/io.h>
133#include <asm/page.h> 134#include <asm/page.h>
@@ -2804,7 +2805,7 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
2804 return -ENODEV; 2805 return -ENODEV;
2805 if (pcidev->irq == 0) 2806 if (pcidev->irq == 0)
2806 return -ENODEV; 2807 return -ENODEV;
2807 i = pci_set_dma_mask(pcidev, 0xffffffff); 2808 i = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
2808 if (i) { 2809 if (i) {
2809 printk(KERN_WARNING "es1371: architecture does not support 32bit PCI busmaster DMA\n"); 2810 printk(KERN_WARNING "es1371: architecture does not support 32bit PCI busmaster DMA\n");
2810 return i; 2811 return i;