diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 08:26:50 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 08:26:50 -0200 |
| commit | b46e1e93b7a6abd37652c7bcd2353cf6de4b68c0 (patch) | |
| tree | 68c0b260cd89163e9c6eaa80f98d58dbe297272b /linux/drivers/media/video/ivtv/ivtv-udma.c | |
| parent | 08650f2ce2368e8dcc8142f933b65aaf3777efef (diff) | |
| parent | db212a276b0513120a21ef0d6a64a3a753a3a215 (diff) | |
| download | mediapointer-dvb-s2-b46e1e93b7a6abd37652c7bcd2353cf6de4b68c0.tar.gz mediapointer-dvb-s2-b46e1e93b7a6abd37652c7bcd2353cf6de4b68c0.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tda8295
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-udma.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-udma.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-udma.c b/linux/drivers/media/video/ivtv/ivtv-udma.c index c4626d1cd..5d4964b24 100644 --- a/linux/drivers/media/video/ivtv/ivtv-udma.c +++ b/linux/drivers/media/video/ivtv/ivtv-udma.c @@ -22,6 +22,7 @@ #include "ivtv-driver.h" #include "ivtv-udma.h" +#include "compat.h" void ivtv_udma_get_page_info(struct ivtv_dma_page_info *dma_page, unsigned long first, unsigned long size) { @@ -49,8 +50,6 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_info unsigned int len = (i == dma_page->page_count - 1) ? dma_page->tail : PAGE_SIZE - offset; - dma->SGlist[map_offset].length = len; - dma->SGlist[map_offset].offset = offset; if (PageHighMem(dma->map[map_offset])) { void *src; @@ -63,10 +62,10 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_info memcpy(page_address(dma->bouncemap[map_offset]) + offset, src, len); kunmap_atomic(src, KM_BOUNCE_READ); local_irq_restore(flags); - dma->SGlist[map_offset].page = dma->bouncemap[map_offset]; + sg_set_page(&dma->SGlist[map_offset], dma->bouncemap[map_offset], len, offset); } else { - dma->SGlist[map_offset].page = dma->map[map_offset]; + sg_set_page(&dma->SGlist[map_offset], dma->map[map_offset], len, offset); } offset = 0; map_offset++; |