aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@nuerscht.ch>2005-05-29 09:21:02 -0400
committerJaroslav Kysela <perex@suse.cz>2005-06-22 06:27:24 -0400
commit299676b1d792ca643f37ff4f3275694a841739b7 (patch)
treefe9fde4a38b70357c4bd9e09902bc62a0258914f /sound/pci/ca0106
parent83a5b72ad7c7cbd0d155d922733b2429f46801bf (diff)
[ALSA] sound/pci/ca0106: Use the DMA_32BIT_MASK constant
CA0106 driver 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: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/ca0106')
-rw-r--r--sound/pci/ca0106/ca0106_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index bfd558c9f3d5..85caf1bbcc11 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -138,6 +138,7 @@
138#include <linux/pci.h> 138#include <linux/pci.h>
139#include <linux/slab.h> 139#include <linux/slab.h>
140#include <linux/moduleparam.h> 140#include <linux/moduleparam.h>
141#include <linux/dma-mapping.h>
141#include <sound/core.h> 142#include <sound/core.h>
142#include <sound/initval.h> 143#include <sound/initval.h>
143#include <sound/pcm.h> 144#include <sound/pcm.h>
@@ -1132,8 +1133,8 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
1132 1133
1133 if ((err = pci_enable_device(pci)) < 0) 1134 if ((err = pci_enable_device(pci)) < 0)
1134 return err; 1135 return err;
1135 if (pci_set_dma_mask(pci, 0xffffffffUL) < 0 || 1136 if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
1136 pci_set_consistent_dma_mask(pci, 0xffffffffUL) < 0) { 1137 pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
1137 printk(KERN_ERR "error to set 32bit mask DMA\n"); 1138 printk(KERN_ERR "error to set 32bit mask DMA\n");
1138 pci_disable_device(pci); 1139 pci_disable_device(pci);
1139 return -ENXIO; 1140 return -ENXIO;