Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d013a068 authored by Tobias Klauser's avatar Tobias Klauser Committed by Linus Torvalds
Browse files

[PATCH] meye: use dma-mapping constants 

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

Signed-off-by: default avatarTobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: default avatarStelian Pop <stelian@popies.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3b30bbd9

drivers/media/video/meye.c

+2 −1
Original line number Diff line number Diff line
@@ -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,