2.6.x misc dma-mask changes
Subsystems (2)
PATCH 1/1 2.6.x misc dma-mask changes
Please pull from the 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6.git
to obtain the changes described in the attachment.
drivers/block/sx8.c | 7 ++++--- sound/oss/via82cxxx_audio.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-)
Tobias Klauser:
sound/oss/via82cxxx_audio: Use the DMA_32BIT_MASK constant drivers/block/sx8.c: Use the DMA_{64, 32}BIT_MASK constants
drivers/block/sx8.c +4 -3
@@ -26,6 +26,7 @@#include <linux/delay.h> #include <linux/time.h> #include <linux/hdreg.h> +#include <linux/dma-mapping.h> #include <asm/io.h> #include <asm/semaphore.h> #include <asm/uaccess.h>
@@ -1582,9 +1583,9 @@ static int carm_init_one (struct pci_dev goto err_out;#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */ - rc =pci_set_dma_mask (pdev,0xffffffffffffffffULL ); + rc =pci_set_dma_mask (pdev,DMA_64BIT_MASK );if (!rc) { - rc =pci_set_consistent_dma_mask (pdev,0xffffffffffffffffULL ); + rc =pci_set_consistent_dma_mask (pdev,DMA_64BIT_MASK );if (rc) { printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n", pci_name(pdev));
@@ -1593,7 +1594,7 @@ static int carm_init_one (struct pci_dev pci_dac = 1; }else {#endif - rc =pci_set_dma_mask (pdev,0xffffffffULL ); + rc =pci_set_dma_mask (pdev,DMA_32BIT_MASK );if (rc) { printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n", pci_name(pdev));
sound/oss/via82cxxx_audio.c +3 -2
@@ -35,6 +35,7 @@#include <linux/smp_lock.h> #include <linux/ioport.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <asm/io.h> #include <asm/uaccess.h> #include <asm/semaphore.h>
@@ -3391,10 +3392,10 @@ static int __devinit via_init_one (strucif (rc) goto err_out_disable; - rc =pci_set_dma_mask (pdev,0xffffffffULL ); + rc =pci_set_dma_mask (pdev,DMA_32BIT_MASK );if (rc) goto err_out_res; - rc =pci_set_consistent_dma_mask (pdev,0xffffffffULL ); + rc =pci_set_consistent_dma_mask (pdev,DMA_32BIT_MASK );if (rc) goto err_out_res;