From 25e3a929373d4fff5aafa5bbebf43f95b0a4b63d Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Fri, 25 Nov 2011 23:14:21 +0800 Subject: [PATCH] --- yaml --- r: 291795 b: refs/heads/master c: b0b38c767e5a3ede700744fb6a99db7bc6e74553 h: refs/heads/master i: 291793: 84feb0ee75ee7d660e8dd091e263b48ba340e1a8 291791: 337bc242f72f861a5dfa90595e482276e8011e7a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-udma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e5aab5324215..396cc04bfdf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2f46e6882564897f6ea3ad904f0a65dc1c6cb3b +refs/heads/master: b0b38c767e5a3ede700744fb6a99db7bc6e74553 diff --git a/trunk/drivers/media/video/ivtv/ivtv-udma.c b/trunk/drivers/media/video/ivtv/ivtv-udma.c index 69cc8166b20b..7338cb2d0a38 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-udma.c +++ b/trunk/drivers/media/video/ivtv/ivtv-udma.c @@ -57,9 +57,9 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_info if (dma->bouncemap[map_offset] == NULL) return -1; local_irq_save(flags); - src = kmap_atomic(dma->map[map_offset], KM_BOUNCE_READ) + offset; + src = kmap_atomic(dma->map[map_offset]) + offset; memcpy(page_address(dma->bouncemap[map_offset]) + offset, src, len); - kunmap_atomic(src, KM_BOUNCE_READ); + kunmap_atomic(src); local_irq_restore(flags); sg_set_page(&dma->SGlist[map_offset], dma->bouncemap[map_offset], len, offset); }