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/trident | |
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/trident')
-rw-r--r-- | sound/pci/trident/trident_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index 83b7d8aba9e6..52178b8ad49d 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
36 | #include <linux/vmalloc.h> | 36 | #include <linux/vmalloc.h> |
37 | #include <linux/gameport.h> | 37 | #include <linux/gameport.h> |
38 | #include <linux/dma-mapping.h> | ||
38 | 39 | ||
39 | #include <sound/core.h> | 40 | #include <sound/core.h> |
40 | #include <sound/info.h> | 41 | #include <sound/info.h> |
@@ -3554,8 +3555,8 @@ int __devinit snd_trident_create(struct snd_card *card, | |||
3554 | if ((err = pci_enable_device(pci)) < 0) | 3555 | if ((err = pci_enable_device(pci)) < 0) |
3555 | return err; | 3556 | return err; |
3556 | /* check, if we can restrict PCI DMA transfers to 30 bits */ | 3557 | /* check, if we can restrict PCI DMA transfers to 30 bits */ |
3557 | if (pci_set_dma_mask(pci, 0x3fffffff) < 0 || | 3558 | if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0 || |
3558 | pci_set_consistent_dma_mask(pci, 0x3fffffff) < 0) { | 3559 | pci_set_consistent_dma_mask(pci, DMA_30BIT_MASK) < 0) { |
3559 | snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n"); | 3560 | snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n"); |
3560 | pci_disable_device(pci); | 3561 | pci_disable_device(pci); |
3561 | return -ENXIO; | 3562 | return -ENXIO; |