aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@nuerscht.ch>2006-03-22 04:53:19 -0500
committerJaroslav Kysela <perex@suse.cz>2006-03-22 04:53:19 -0500
commit9d2f928ddf64ca0361562e30faf584cd33055c60 (patch)
treec9f57551988fc492e20553aa39b24af7547ab239 /sound/pci/ice1712
parent84f3430c7255668a0298d166605d27e3c96b5de4 (diff)
[PATCH] Intruduce DMA_28BIT_MASK
This patch introduces the DMA_28BIT_MASK constant in dma-mapping.h ALSA drivers using this mask are changed to use the new constant. Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Acked-by: Takashi Iwai <tiwai@suse.de> Acked-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r--sound/pci/ice1712/ice1712.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index b96b5d6efc5d..672e198317e1 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -53,6 +53,7 @@
53#include <linux/interrupt.h> 53#include <linux/interrupt.h>
54#include <linux/init.h> 54#include <linux/init.h>
55#include <linux/pci.h> 55#include <linux/pci.h>
56#include <linux/dma-mapping.h>
56#include <linux/slab.h> 57#include <linux/slab.h>
57#include <linux/moduleparam.h> 58#include <linux/moduleparam.h>
58#include <linux/mutex.h> 59#include <linux/mutex.h>
@@ -2553,8 +2554,8 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
2553 if ((err = pci_enable_device(pci)) < 0) 2554 if ((err = pci_enable_device(pci)) < 0)
2554 return err; 2555 return err;
2555 /* check, if we can restrict PCI DMA transfers to 28 bits */ 2556 /* check, if we can restrict PCI DMA transfers to 28 bits */
2556 if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || 2557 if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
2557 pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { 2558 pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
2558 snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); 2559 snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
2559 pci_disable_device(pci); 2560 pci_disable_device(pci);
2560 return -ENXIO; 2561 return -ENXIO;