diff options
| author | Newson Edouard | 2011-04-19 16:54:54 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-07-27 22:52:19 +0200 |
| commit | 45f239ab82b2a808103a0fae02594961b09c5c8b (patch) | |
| tree | a42b4115f12ced98c6c4a6a5a7b990e3c1d8ff37 /drivers/media/video/videobuf-dma-sg.c | |
| parent | [media] cx23885: restore flushes of cx23885_dev work items (diff) | |
| download | kernel-qcow2-linux-45f239ab82b2a808103a0fae02594961b09c5c8b.tar.gz kernel-qcow2-linux-45f239ab82b2a808103a0fae02594961b09c5c8b.tar.xz kernel-qcow2-linux-45f239ab82b2a808103a0fae02594961b09c5c8b.zip | |
[media] videobuf_pages_to_sg: sglist[0] length problem
On function videobuf_pages_to_sg the statement sg_set_page(&sglist[0],
pages[0], PAGE_SIZE - offset, offset) will fail if size is less than
PAGE_SIZE.
Signed-off-by: Newson Edouard <newsondev@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/videobuf-dma-sg.c')
| -rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index ddb8f4b46c03..f300deafd268 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c @@ -108,8 +108,9 @@ static struct scatterlist *videobuf_pages_to_sg(struct page **pages, if (PageHighMem(pages[0])) /* DMA to highmem pages might not work */ goto highmem; - sg_set_page(&sglist[0], pages[0], PAGE_SIZE - offset, offset); - size -= PAGE_SIZE - offset; + sg_set_page(&sglist[0], pages[0], + min_t(size_t, PAGE_SIZE - offset, size), offset); + size -= min_t(size_t, PAGE_SIZE - offset, size); for (i = 1; i < nr_pages; i++) { if (NULL == pages[i]) goto nopage; |