summaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@nuerscht.ch>2005-06-25 14:59:25 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 16:25:08 -0700
commitcaac3a444ce3b5a8d76069abfbb699d2a65b3f09 (patch)
treee58a107c5d6eed6f367ef8f0ed8f3978aa39bbad /sound/oss
parentf90e7185ee00c1faa9d07b2f669d124772fdba17 (diff)
downloadlinux-3.10-caac3a444ce3b5a8d76069abfbb699d2a65b3f09.tar.gz
linux-3.10-caac3a444ce3b5a8d76069abfbb699d2a65b3f09.tar.bz2
linux-3.10-caac3a444ce3b5a8d76069abfbb699d2a65b3f09.zip
[PATCH] sound/oss/esssolo1: 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>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/esssolo1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c
index 6b3b9a99579..fb09065d07c 100644
--- a/sound/oss/esssolo1.c
+++ b/sound/oss/esssolo1.c
@@ -104,6 +104,7 @@
#include <linux/smp_lock.h>
#include <linux/gameport.h>
#include <linux/wait.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/page.h>
@@ -2326,7 +2327,7 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device
* to 24 bits first, then 32 bits (playback only) if that fails.
*/
if (pci_set_dma_mask(pcidev, 0x00ffffff) &&
- pci_set_dma_mask(pcidev, 0xffffffff)) {
+ pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n");
return -ENODEV;
}