drivers/media/video/bttv-driver.c: Use the
Subsystems (2)
PATCH 1/1 drivers/media/video/bttv-driver.c: Use the
The previous patch did not compile cleanly on all architectures so here's a fixed one.
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details
drivers/media/video/bttv-driver.c +2 -1
@@ -35,6 +35,7 @@#include <linux/sched.h> #include <linux/interrupt.h> #include <linux/kdev_t.h> +#include <linux/dma-mapping.h> #include <asm/io.h> #include <asm/byteorder.h>
@@ -3752,7 +3753,7 @@ static int __devinit bttv_probe(struct p btv->c.nr);return -EIO ; } -if (pci_set_dma_mask (dev,0xffffffff )) { +if (pci_set_dma_mask (dev,DMA_32BIT_MASK )) {printk (KERN_WARNING "bttv%d: No suitable DMA available.\n" , btv->c.nr);return -EIO ;
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 drivers/media/video/meye.c: Use the
Hi Stelian,
Quoted 1 line · Stelian Pop
Thanks, applied to my tree. I will push it upstream later.
The previous patch does not compile cleanly on all architectures. Please use the attached one instead.
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details
drivers/media/video/meye.c +2 -1
@@ -37,6 +37,7 @@#include <linux/delay.h> #include <linux/interrupt.h> #include <linux/vmalloc.h> +#include <linux/dma-mapping.h> #include "meye.h" #include <linux/meye.h>
@@ -121,7 +122,7 @@ static int ptable_alloc(void)memset (meye.mchip_ptable,0 ,sizeof (meye.mchip_ptable));/* give only 32 bit DMA addresses */ -if (dma_set_mask (&meye.mchip_dev->dev,0xffffffff )) +if (dma_set_mask (&meye.mchip_dev->dev,DMA_32BIT_MASK ))return -1 ; meye.mchip_ptable_toc = dma_alloc_coherent(&meye.mchip_dev->dev,
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors