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/pci/ali5451 | |
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/pci/ali5451')
-rw-r--r-- | sound/pci/ali5451/ali5451.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index e264136e8fb4..fc92b6896c24 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
35 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
36 | #include <linux/dma-mapping.h> | ||
36 | #include <sound/core.h> | 37 | #include <sound/core.h> |
37 | #include <sound/pcm.h> | 38 | #include <sound/pcm.h> |
38 | #include <sound/info.h> | 39 | #include <sound/info.h> |
@@ -2220,8 +2221,8 @@ static int __devinit snd_ali_create(struct snd_card *card, | |||
2220 | if ((err = pci_enable_device(pci)) < 0) | 2221 | if ((err = pci_enable_device(pci)) < 0) |
2221 | return err; | 2222 | return err; |
2222 | /* check, if we can restrict PCI DMA transfers to 31 bits */ | 2223 | /* check, if we can restrict PCI DMA transfers to 31 bits */ |
2223 | if (pci_set_dma_mask(pci, 0x7fffffff) < 0 || | 2224 | if (pci_set_dma_mask(pci, DMA_31BIT_MASK) < 0 || |
2224 | pci_set_consistent_dma_mask(pci, 0x7fffffff) < 0) { | 2225 | pci_set_consistent_dma_mask(pci, DMA_31BIT_MASK) < 0) { |
2225 | snd_printk(KERN_ERR "architecture does not support 31bit PCI busmaster DMA\n"); | 2226 | snd_printk(KERN_ERR "architecture does not support 31bit PCI busmaster DMA\n"); |
2226 | pci_disable_device(pci); | 2227 | pci_disable_device(pci); |
2227 | return -ENXIO; | 2228 | return -ENXIO; |