diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-18 17:57:06 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-07-18 17:59:58 +0800 |
| commit | 9b2555d5cad2b2760d0e4f5126788f9e003979fd (patch) | |
| tree | 399292000ea794b31d37b50bf15e3627c138db96 /drivers | |
| parent | 824a7b6c55a10f4ee6b925eb91458384e9a8c586 (diff) | |
ENGR00271679-2 Add SoloLite into Android JB release
Fix the build error in csi capture
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/mxc/capture/csi_v4l2_capture.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/capture/csi_v4l2_capture.c b/drivers/media/video/mxc/capture/csi_v4l2_capture.c index 7e108f7bac03..5458ee6ed054 100644 --- a/drivers/media/video/mxc/capture/csi_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/csi_v4l2_capture.c @@ -1388,11 +1388,10 @@ static long csi_v4l_do_ioctl(struct file *file, csi_streamoff(cam); if (req->memory & V4L2_MEMORY_MMAP) csi_free_frame_buf(cam); - cam->skip_frame = 0; INIT_LIST_HEAD(&cam->ready_q); INIT_LIST_HEAD(&cam->working_q); INIT_LIST_HEAD(&cam->done_q); - if (req->memory & V4L2_MEMORY_MMAP) + if (req->memory & V4L2_MEMORY_MMAP) { retval = csi_allocate_frame_buf(cam, req->count + 1); req_buf_number = req->count; } |