Messages in this thread Patch in this message | | | Date | Tue, 3 Feb 2004 15:36:06 -0800 | From | "Randy.Dunlap" <> | Subject | [PATCH] meye: correct printk of dma_addr_t |
| |
description: fix dma_addr_t type error with CONFIG_HIGHMEM64G=y; product_versions: linux-262-rc3
diffstat:= drivers/media/video/meye.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff -Naurp ./drivers/media/video/meye.c~meye_dma ./drivers/media/video/meye.c --- ./drivers/media/video/meye.c~meye_dma 2004-01-08 22:59:44.000000000 -0800 +++ ./drivers/media/video/meye.c 2004-02-03 14:43:42.000000000 -0800 @@ -162,7 +162,7 @@ static void rvfree(void * mem, unsigned /* return a page table pointing to N pages of locked memory */ static int ptable_alloc(void) { - u32 *pt; + dma_addr_t *pt; int i; memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable)); @@ -176,7 +176,7 @@ static int ptable_alloc(void) { return -1; } - pt = (u32 *)meye.mchip_ptable[MCHIP_NB_PAGES]; + pt = (dma_addr_t *)meye.mchip_ptable[MCHIP_NB_PAGES]; for (i = 0; i < MCHIP_NB_PAGES; i++) { meye.mchip_ptable[i] = dma_alloc_coherent(&meye.mchip_dev->dev, PAGE_SIZE, @@ -184,7 +184,7 @@ static int ptable_alloc(void) { GFP_KERNEL); if (!meye.mchip_ptable[i]) { int j; - pt = (u32 *)meye.mchip_ptable[MCHIP_NB_PAGES]; + pt = (dma_addr_t *)meye.mchip_ptable[MCHIP_NB_PAGES]; for (j = 0; j < i; ++j) { dma_free_coherent(&meye.mchip_dev->dev, PAGE_SIZE, @@ -200,10 +200,10 @@ static int ptable_alloc(void) { } static void ptable_free(void) { - u32 *pt; + dma_addr_t *pt; int i; - pt = (u32 *)meye.mchip_ptable[MCHIP_NB_PAGES]; + pt = (dma_addr_t *)meye.mchip_ptable[MCHIP_NB_PAGES]; for (i = 0; i < MCHIP_NB_PAGES; i++) { if (meye.mchip_ptable[i]) dma_free_coherent(&meye.mchip_dev->dev,
-- ~Randy - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |