aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/dma-mapping.h1
-rw-r--r--sound/pci/ad1889.c7
-rw-r--r--sound/pci/emu10k1/emu10k1x.c13
-rw-r--r--sound/pci/es1968.c5
-rw-r--r--sound/pci/ice1712/ice1712.c5
-rw-r--r--sound/pci/maestro3.c5
-rw-r--r--sound/pci/mixart/mixart.c3
-rw-r--r--sound/pci/pcxhr/pcxhr.c3
8 files changed, 25 insertions, 17 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 2d80cc761a15..a8731062a74c 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -20,6 +20,7 @@ enum dma_data_direction {
20#define DMA_31BIT_MASK 0x000000007fffffffULL 20#define DMA_31BIT_MASK 0x000000007fffffffULL
21#define DMA_30BIT_MASK 0x000000003fffffffULL 21#define DMA_30BIT_MASK 0x000000003fffffffULL
22#define DMA_29BIT_MASK 0x000000001fffffffULL 22#define DMA_29BIT_MASK 0x000000001fffffffULL
23#define DMA_28BIT_MASK 0x000000000fffffffULL
23 24
24#include <asm/dma-mapping.h> 25#include <asm/dma-mapping.h>
25 26
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index a208075cdc1e..2aa5a7fdb6e0 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -34,6 +34,7 @@
34 34
35#include <linux/init.h> 35#include <linux/init.h>
36#include <linux/pci.h> 36#include <linux/pci.h>
37#include <linux/dma-mapping.h>
37#include <linux/slab.h> 38#include <linux/slab.h>
38#include <linux/interrupt.h> 39#include <linux/interrupt.h>
39#include <linux/compiler.h> 40#include <linux/compiler.h>
@@ -909,10 +910,10 @@ snd_ad1889_create(struct snd_card *card,
909 910
910 if ((err = pci_enable_device(pci)) < 0) 911 if ((err = pci_enable_device(pci)) < 0)
911 return err; 912 return err;
912 913
913 /* check PCI availability (32bit DMA) */ 914 /* check PCI availability (32bit DMA) */
914 if (pci_set_dma_mask(pci, 0xffffffff) < 0 || 915 if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
915 pci_set_consistent_dma_mask(pci, 0xffffffff) < 0) { 916 pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
916 printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n"); 917 printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n");
917 pci_disable_device(pci); 918 pci_disable_device(pci);
918 return -ENXIO; 919 return -ENXIO;
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 1107c8ec7f78..2208dbd48be9 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -33,6 +33,7 @@
33#include <linux/init.h> 33#include <linux/init.h>
34#include <linux/interrupt.h> 34#include <linux/interrupt.h>
35#include <linux/pci.h> 35#include <linux/pci.h>
36#include <linux/dma-mapping.h>
36#include <linux/slab.h> 37#include <linux/slab.h>
37#include <linux/moduleparam.h> 38#include <linux/moduleparam.h>
38#include <sound/core.h> 39#include <sound/core.h>
@@ -893,24 +894,24 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,
893 static struct snd_device_ops ops = { 894 static struct snd_device_ops ops = {
894 .dev_free = snd_emu10k1x_dev_free, 895 .dev_free = snd_emu10k1x_dev_free,
895 }; 896 };
896 897
897 *rchip = NULL; 898 *rchip = NULL;
898 899
899 if ((err = pci_enable_device(pci)) < 0) 900 if ((err = pci_enable_device(pci)) < 0)
900 return err; 901 return err;
901 if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || 902 if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
902 pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { 903 pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
903 snd_printk(KERN_ERR "error to set 28bit mask DMA\n"); 904 snd_printk(KERN_ERR "error to set 28bit mask DMA\n");
904 pci_disable_device(pci); 905 pci_disable_device(pci);
905 return -ENXIO; 906 return -ENXIO;
906 } 907 }
907 908
908 chip = kzalloc(sizeof(*chip), GFP_KERNEL); 909 chip = kzalloc(sizeof(*chip), GFP_KERNEL);
909 if (chip == NULL) { 910 if (chip == NULL) {
910 pci_disable_device(pci); 911 pci_disable_device(pci);
911 return -ENOMEM; 912 return -ENOMEM;
912 } 913 }
913 914
914 chip->card = card; 915 chip->card = card;
915 chip->pci = pci; 916 chip->pci = pci;
916 chip->irq = -1; 917 chip->irq = -1;
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 6a265ab3894e..dd465a186e11 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -100,6 +100,7 @@
100#include <linux/interrupt.h> 100#include <linux/interrupt.h>
101#include <linux/init.h> 101#include <linux/init.h>
102#include <linux/pci.h> 102#include <linux/pci.h>
103#include <linux/dma-mapping.h>
103#include <linux/slab.h> 104#include <linux/slab.h>
104#include <linux/gameport.h> 105#include <linux/gameport.h>
105#include <linux/moduleparam.h> 106#include <linux/moduleparam.h>
@@ -2561,8 +2562,8 @@ static int __devinit snd_es1968_create(struct snd_card *card,
2561 if ((err = pci_enable_device(pci)) < 0) 2562 if ((err = pci_enable_device(pci)) < 0)
2562 return err; 2563 return err;
2563 /* check, if we can restrict PCI DMA transfers to 28 bits */ 2564 /* check, if we can restrict PCI DMA transfers to 28 bits */
2564 if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || 2565 if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
2565 pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { 2566 pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
2566 snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); 2567 snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
2567 pci_disable_device(pci); 2568 pci_disable_device(pci);
2568 return -ENXIO; 2569 return -ENXIO;
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;
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;
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index e79fb264532b..43ee3b2b948f 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -25,6 +25,7 @@
25#include <linux/init.h> 25#include <linux/init.h>
26#include <linux/interrupt.h> 26#include <linux/interrupt.h>
27#include <linux/pci.h> 27#include <linux/pci.h>
28#include <linux/dma-mapping.h>
28#include <linux/moduleparam.h> 29#include <linux/moduleparam.h>
29#include <linux/mutex.h> 30#include <linux/mutex.h>
30#include <sound/core.h> 31#include <sound/core.h>
@@ -1289,7 +1290,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
1289 pci_set_master(pci); 1290 pci_set_master(pci);
1290 1291
1291 /* check if we can restrict PCI DMA transfers to 32 bits */ 1292 /* check if we can restrict PCI DMA transfers to 32 bits */
1292 if (pci_set_dma_mask(pci, 0xffffffff) < 0) { 1293 if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) {
1293 snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n"); 1294 snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n");
1294 pci_disable_device(pci); 1295 pci_disable_device(pci);
1295 return -ENXIO; 1296 return -ENXIO;
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 31a3e8e1b234..f679779d96e3 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -26,6 +26,7 @@
26#include <linux/interrupt.h> 26#include <linux/interrupt.h>
27#include <linux/slab.h> 27#include <linux/slab.h>
28#include <linux/pci.h> 28#include <linux/pci.h>
29#include <linux/dma-mapping.h>
29#include <linux/delay.h> 30#include <linux/delay.h>
30#include <linux/moduleparam.h> 31#include <linux/moduleparam.h>
31#include <linux/mutex.h> 32#include <linux/mutex.h>
@@ -1217,7 +1218,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id
1217 pci_set_master(pci); 1218 pci_set_master(pci);
1218 1219
1219 /* check if we can restrict PCI DMA transfers to 32 bits */ 1220 /* check if we can restrict PCI DMA transfers to 32 bits */
1220 if (pci_set_dma_mask(pci, 0xffffffff) < 0) { 1221 if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) {
1221 snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n"); 1222 snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n");
1222 pci_disable_device(pci); 1223 pci_disable_device(pci);
1223 return -ENXIO; 1224 return -ENXIO;