Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7360
b: refs/heads/master
c: d013a06
h: refs/heads/master
v: v3
  • Loading branch information
Tobias Klauser authored and Linus Torvalds committed Sep 7, 2005
1 parent b1984f2 commit a81c5f7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3b30bbd963ac2606b0377b39c9d148d6eeef7dce
refs/heads/master: d013a068a5675ecd8e71f585a44e7af0798a4307
3 changes: 2 additions & 1 deletion trunk/drivers/media/video/meye.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit a81c5f7

Please sign in to comment.