aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/emu10k1/main.c3
-rw-r--r--sound/pci/als300.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c
index 0cd44a6f7ac0..3721c5857b90 100644
--- a/sound/oss/emu10k1/main.c
+++ b/sound/oss/emu10k1/main.c
@@ -94,6 +94,7 @@
94#include <linux/init.h> 94#include <linux/init.h>
95#include <linux/delay.h> 95#include <linux/delay.h>
96#include <linux/proc_fs.h> 96#include <linux/proc_fs.h>
97#include <linux/dma-mapping.h>
97 98
98#include "hwaccess.h" 99#include "hwaccess.h"
99#include "8010.h" 100#include "8010.h"
@@ -119,7 +120,7 @@
119 120
120 121
121/* the emu10k1 _seems_ to only supports 29 bit (512MiB) bit bus master */ 122/* the emu10k1 _seems_ to only supports 29 bit (512MiB) bit bus master */
122#define EMU10K1_DMA_MASK 0x1fffffff /* DMA buffer mask for pci_alloc_consist */ 123#define EMU10K1_DMA_MASK DMA_29BIT_MASK /* DMA buffer mask for pci_alloc_consist */
123 124
124#ifndef PCI_VENDOR_ID_CREATIVE 125#ifndef PCI_VENDOR_ID_CREATIVE
125#define PCI_VENDOR_ID_CREATIVE 0x1102 126#define PCI_VENDOR_ID_CREATIVE 0x1102
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 37b80570a5c6..91899f87f037 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -35,6 +35,7 @@
35#include <linux/init.h> 35#include <linux/init.h>
36#include <linux/moduleparam.h> 36#include <linux/moduleparam.h>
37#include <linux/pci.h> 37#include <linux/pci.h>
38#include <linux/dma-mapping.h>
38#include <linux/interrupt.h> 39#include <linux/interrupt.h>
39#include <linux/slab.h> 40#include <linux/slab.h>
40 41
@@ -691,8 +692,8 @@ static int __devinit snd_als300_create(snd_card_t *card,
691 if ((err = pci_enable_device(pci)) < 0) 692 if ((err = pci_enable_device(pci)) < 0)
692 return err; 693 return err;
693 694
694 if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || 695 if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
695 pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { 696 pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
696 printk(KERN_ERR "error setting 28bit DMA mask\n"); 697 printk(KERN_ERR "error setting 28bit DMA mask\n");
697 pci_disable_device(pci); 698 pci_disable_device(pci);
698 return -ENXIO; 699 return -ENXIO;