lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] sound/oss/esssolo1: Use the DMA_32BIT_MASK constant

Browse Source 
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>
This commit is contained in:
Tobias Klauser
2005-06-25 14:59:25 -07:00
committed by Linus Torvalds
parent f90e7185ee
commit caac3a444c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/oss/esssolo1.c
View File

@@ -104,6 +104,7 @@
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/gameport.h> #include <linux/gameport.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/dma-mapping.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/page.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. * to 24 bits first, then 32 bits (playback only) if that fails.
*/ */
if (pci_set_dma_mask(pcidev, 0x00ffffff) && 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"); printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n");
return -ENODEV; return -ENODEV;
} }