diff options
author | Tobias Klauser <tklauser@nuerscht.ch> | 2005-06-25 17:59:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:25:08 -0400 |
commit | caac3a444ce3b5a8d76069abfbb699d2a65b3f09 (patch) | |
tree | e58a107c5d6eed6f367ef8f0ed8f3978aa39bbad /sound | |
parent | f90e7185ee00c1faa9d07b2f669d124772fdba17 (diff) |
[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')
-rw-r--r-- | sound/oss/esssolo1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c index 6b3b9a99579d..fb09065d07c8 100644 --- a/sound/oss/esssolo1.c +++ b/sound/oss/esssolo1.c | |||
@@ -104,6 +104,7 @@ | |||
104 | #include <linux/smp_lock.h> | 104 | #include <linux/smp_lock.h> |
105 | #include <linux/gameport.h> | 105 | #include <linux/gameport.h> |
106 | #include <linux/wait.h> | 106 | #include <linux/wait.h> |
107 | #include <linux/dma-mapping.h> | ||
107 | 108 | ||
108 | #include <asm/io.h> | 109 | #include <asm/io.h> |
109 | #include <asm/page.h> | 110 | #include <asm/page.h> |
@@ -2326,7 +2327,7 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device | |||
2326 | * to 24 bits first, then 32 bits (playback only) if that fails. | 2327 | * to 24 bits first, then 32 bits (playback only) if that fails. |
2327 | */ | 2328 | */ |
2328 | if (pci_set_dma_mask(pcidev, 0x00ffffff) && | 2329 | if (pci_set_dma_mask(pcidev, 0x00ffffff) && |
2329 | pci_set_dma_mask(pcidev, 0xffffffff)) { | 2330 | pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) { |
2330 | printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n"); | 2331 | printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n"); |
2331 | return -ENODEV; | 2332 | return -ENODEV; |
2332 | } | 2333 | } |