diff options
author | Matthias Gehre <M.Gehre@gmx.de> | 2006-03-28 04:56:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 12:16:07 -0500 |
commit | 910638ae7ed4be27d6af55f6c9b5bf54b838e78b (patch) | |
tree | 5eda3cfd0e312c8b0916f6d5eb1cd98225e67891 /sound/oss | |
parent | 60c904ae5bded8bb71f7bff7d63f2a6959d2a8e4 (diff) |
[PATCH] Replace 0xff.. with correct DMA_xBIT_MASK
Replace all occurences of 0xff.. in calls to function pci_set_dma_mask()
and pci_set_consistant_dma_mask() with the corresponding DMA_xBIT_MASK from
linux/dma-mapping.h.
Signed-off-by: Matthias Gehre <M.Gehre@gmx.de>
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.c | 2 | ||||
-rw-r--r-- | sound/oss/sonicvibes.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c index 78d3e29ce968..6861563d7525 100644 --- a/sound/oss/esssolo1.c +++ b/sound/oss/esssolo1.c | |||
@@ -2348,7 +2348,7 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device | |||
2348 | /* Recording requires 24-bit DMA, so attempt to set dma mask | 2348 | /* Recording requires 24-bit DMA, so attempt to set dma mask |
2349 | * to 24 bits first, then 32 bits (playback only) if that fails. | 2349 | * to 24 bits first, then 32 bits (playback only) if that fails. |
2350 | */ | 2350 | */ |
2351 | if (pci_set_dma_mask(pcidev, 0x00ffffff) && | 2351 | if (pci_set_dma_mask(pcidev, DMA_24BIT_MASK) && |
2352 | pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) { | 2352 | pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) { |
2353 | printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n"); | 2353 | printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n"); |
2354 | return -ENODEV; | 2354 | return -ENODEV; |
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c index 4471757b7985..42bd276cfc39 100644 --- a/sound/oss/sonicvibes.c +++ b/sound/oss/sonicvibes.c | |||
@@ -116,6 +116,7 @@ | |||
116 | #include <linux/spinlock.h> | 116 | #include <linux/spinlock.h> |
117 | #include <linux/smp_lock.h> | 117 | #include <linux/smp_lock.h> |
118 | #include <linux/gameport.h> | 118 | #include <linux/gameport.h> |
119 | #include <linux/dma-mapping.h> | ||
119 | #include <linux/mutex.h> | 120 | #include <linux/mutex.h> |
120 | 121 | ||
121 | 122 | ||
@@ -2535,7 +2536,7 @@ static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id | |||
2535 | return -ENODEV; | 2536 | return -ENODEV; |
2536 | if (pcidev->irq == 0) | 2537 | if (pcidev->irq == 0) |
2537 | return -ENODEV; | 2538 | return -ENODEV; |
2538 | if (pci_set_dma_mask(pcidev, 0x00ffffff)) { | 2539 | if (pci_set_dma_mask(pcidev, DMA_24BIT_MASK)) { |
2539 | printk(KERN_WARNING "sonicvibes: architecture does not support 24bit PCI busmaster DMA\n"); | 2540 | printk(KERN_WARNING "sonicvibes: architecture does not support 24bit PCI busmaster DMA\n"); |
2540 | return -ENODEV; | 2541 | return -ENODEV; |
2541 | } | 2542 | } |