diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-13 04:56:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-13 04:56:24 -0400 |
| commit | 74b8721099992b76d3faff78cb8a5d13c65c3529 (patch) | |
| tree | 2c9971160051cae98237715f791ce2b93a0720b5 /drivers/media/video/omap24xxcam.c | |
| parent | 4bddaf66093ce0e0c1fce505f091f4cd52e73e2e (diff) | |
| parent | baffe1699c68da5040de6b274054adc995795782 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'drivers/media/video/omap24xxcam.c')
| -rw-r--r-- | drivers/media/video/omap24xxcam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c index b189fe63394b..ce76d952e161 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/drivers/media/video/omap24xxcam.c | |||
| @@ -1405,7 +1405,7 @@ static int omap24xxcam_mmap_buffers(struct file *file, | |||
| 1405 | } | 1405 | } |
| 1406 | 1406 | ||
| 1407 | size = 0; | 1407 | size = 0; |
| 1408 | for (i = first; i <= last; i++) { | 1408 | for (i = first; i <= last && i < VIDEO_MAX_FRAME; i++) { |
| 1409 | struct videobuf_dmabuf *dma = videobuf_to_dma(vbq->bufs[i]); | 1409 | struct videobuf_dmabuf *dma = videobuf_to_dma(vbq->bufs[i]); |
| 1410 | 1410 | ||
| 1411 | for (j = 0; j < dma->sglen; j++) { | 1411 | for (j = 0; j < dma->sglen; j++) { |