aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/maestro3.c
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/maestro3.c
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/maestro3.c')
-rw-r--r--sound/pci/maestro3.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index d3ef0cc6c4f9..8bc084956c28 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -37,6 +37,7 @@
37#include <linux/interrupt.h> 37#include <linux/interrupt.h>
38#include <linux/init.h> 38#include <linux/init.h>
39#include <linux/pci.h> 39#include <linux/pci.h>
40#include <linux/dma-mapping.h>
40#include <linux/slab.h> 41#include <linux/slab.h>
41#include <linux/vmalloc.h> 42#include <linux/vmalloc.h>
42#include <linux/moduleparam.h> 43#include <linux/moduleparam.h>
@@ -2657,8 +2658,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
2657 return -EIO; 2658 return -EIO;
2658 2659
2659 /* check, if we can restrict PCI DMA transfers to 28 bits */ 2660 /* check, if we can restrict PCI DMA transfers to 28 bits */
2660 if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || 2661 if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
2661 pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { 2662 pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
2662 snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); 2663 snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
2663 pci_disable_device(pci); 2664 pci_disable_device(pci);
2664 return -ENXIO; 2665 return -ENXIO;