Update of /cvsroot/alsa/alsa-kernel/pci In directory sc8-pr-cvs1:/tmp/cvs-serv12541/pci
Modified Files: als4000.c azt3328.c es1938.c es1968.c maestro3.c sonicvibes.c Log Message: - fixed the DMA allocation. pci_set_dma_mask() is called together with pci_set_consistent_dma_mask(). also clean up the double check of mask. Index: als4000.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- als4000.c 20 Nov 2003 13:22:19 -0000 1.25 +++ als4000.c 19 Jan 2004 18:37:35 -0000 1.26 @@ -621,11 +621,11 @@ return err; } /* check, if we can restrict PCI DMA transfers to 24 bits */ - if (!pci_dma_supported(pci, 0x00ffffff)) { + if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || + pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { snd_printk("architecture does not support 24bit PCI busmaster DMA\n"); return -ENXIO; } - pci_set_consistent_dma_mask(pci, 0x00ffffff); gcr = pci_resource_start(pci, 0); if ((res_gcr_port = request_region(gcr, 0x40, "ALS4000")) == NULL) { Index: azt3328.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/azt3328.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- azt3328.c 20 Nov 2003 13:22:19 -0000 1.7 +++ azt3328.c 19 Jan 2004 18:37:35 -0000 1.8 @@ -1361,11 +1361,11 @@ chip->irq = -1; /* check if we can restrict PCI DMA transfers to 24 bits */ - if (!pci_dma_supported(pci, 0x00ffffff)) { + if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || + pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { snd_printk("architecture does not support 24bit PCI busmaster DMA\n"); return -ENXIO; } - pci_set_consistent_dma_mask(pci, 0x00ffffff); chip->codec_port = pci_resource_start(pci, 0); if ((chip->res_codec_port = request_region(chip->codec_port, 0x80, "Aztech AZF3328 I/O")) == NULL) { Index: es1938.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/es1938.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- es1938.c 20 Nov 2003 13:22:19 -0000 1.28 +++ es1938.c 19 Jan 2004 18:37:35 -0000 1.29 @@ -1398,11 +1398,11 @@ if ((err = pci_enable_device(pci)) < 0) return err; /* check, if we can restrict PCI DMA transfers to 24 bits */ - if (!pci_dma_supported(pci, 0x00ffffff)) { + if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || + pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { snd_printk("architecture does not support 24bit PCI busmaster DMA\n"); return -ENXIO; } - pci_set_consistent_dma_mask(pci, 0x00ffffff); chip = snd_magic_kcalloc(es1938_t, 0, GFP_KERNEL); if (chip == NULL) Index: es1968.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- es1968.c 20 Nov 2003 13:22:19 -0000 1.57 +++ es1968.c 19 Jan 2004 18:37:35 -0000 1.58 @@ -2563,11 +2563,11 @@ if ((err = pci_enable_device(pci)) < 0) return err; /* check, if we can restrict PCI DMA transfers to 28 bits */ - if (!pci_dma_supported(pci, 0x0fffffff)) { + if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || + pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { snd_printk("architecture does not support 28bit PCI busmaster DMA\n"); return -ENXIO; } - pci_set_consistent_dma_mask(pci, 0x0fffffff); chip = (es1968_t *) snd_magic_kcalloc(es1968_t, 0, GFP_KERNEL); if (! chip) Index: maestro3.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/maestro3.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- maestro3.c 20 Nov 2003 13:22:19 -0000 1.44 +++ maestro3.c 19 Jan 2004 18:37:35 -0000 1.45 @@ -2547,11 +2547,11 @@ return -EIO; /* check, if we can restrict PCI DMA transfers to 28 bits */ - if (!pci_dma_supported(pci, 0x0fffffff)) { + if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || + pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { snd_printk("architecture does not support 28bit PCI busmaster DMA\n"); return -ENXIO; } - pci_set_consistent_dma_mask(pci, 0x0fffffff); chip = snd_magic_kcalloc(m3_t, 0, GFP_KERNEL); if (chip == NULL) Index: sonicvibes.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/sonicvibes.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sonicvibes.c 20 Nov 2003 13:22:19 -0000 1.28 +++ sonicvibes.c 19 Jan 2004 18:37:35 -0000 1.29 @@ -1249,11 +1249,11 @@ if ((err = pci_enable_device(pci)) < 0) return err; /* check, if we can restrict PCI DMA transfers to 24 bits */ - if (!pci_dma_supported(pci, 0x00ffffff)) { + if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || + pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { snd_printk("architecture does not support 24bit PCI busmaster DMA\n"); return -ENXIO; } - pci_set_consistent_dma_mask(pci, 0x00ffffff); sonic = snd_magic_kcalloc(sonicvibes_t, 0, GFP_KERNEL); if (sonic == NULL) ------------------------------------------------------- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog