diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-20 00:56:41 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-10 05:05:48 +0400 |
| commit | 8beb058f1ecde7bc0554d18ce1baa18b5dfb02d3 (patch) | |
| tree | 0ac375d2d009baca2d39ffae97734d04b167872d /drivers/media/video/ivtv/ivtv-yuv.c | |
| parent | 25e3f8f40ecf61b87a4b6476ea6d00cb5b74628c (diff) | |
| download | linux-8beb058f1ecde7bc0554d18ce1baa18b5dfb02d3.tar.xz | |
V4L/DVB (6060): ivtv: fix IVTV_IOC_DMA_FRAME bug introduced by highmem bugfix
The return value of ivtv_udma_fill_sg_list() was changed by the
highmem bugfix, but that return value was still used in ivtv-yuv.c.
Revert to the old return value, but in addition return -1 in case of
a memory allocation error.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-yuv.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-yuv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c index 2ae7556f5e68..1922c1da20d3 100644 --- a/drivers/media/video/ivtv/ivtv-yuv.c +++ b/drivers/media/video/ivtv/ivtv-yuv.c @@ -83,7 +83,7 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma, } /* Fill & map SG List */ - if (ivtv_udma_fill_sg_list (dma, &uv_dma, ivtv_udma_fill_sg_list (dma, &y_dma, 0))) { + if (ivtv_udma_fill_sg_list (dma, &uv_dma, ivtv_udma_fill_sg_list (dma, &y_dma, 0)) < 0) { IVTV_DEBUG_WARN("could not allocate bounce buffers for highmem userspace buffers\n"); for (i = 0; i < dma->page_count; i++) { put_page(dma->map[i]); |