diff options
| author | Mekala Natarajan <mekalan@codeaurora.org> | 2014-01-16 13:50:18 -0800 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2014-01-16 15:11:26 -0800 |
| commit | edda38bcd3d3a3344e09925e7bb629b9e1361a36 (patch) | |
| tree | 746a7b0d7a3d1757e9edf3d0c3ef8cc497ad1b07 /camera/mm-camera-interface/mm_camera_channel.c | |
| parent | b8d393e7224d1cbd1fad5f9b819e71f092927cdf (diff) | |
| download | mako-edda38bcd3d3a3344e09925e7bb629b9e1361a36.tar.gz | |
camera: Fixes for race conditions in abnormal snapshot stop.
Change-Id: Iba20800baee92dcd59ae6edb96e7dc1953c83a88
Bug: 12467743
Bug: 11021907
Diffstat (limited to 'camera/mm-camera-interface/mm_camera_channel.c')
| -rwxr-xr-x[-rw-r--r--] | camera/mm-camera-interface/mm_camera_channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/mm-camera-interface/mm_camera_channel.c b/camera/mm-camera-interface/mm_camera_channel.c index 6e01c8d..40f3fb0 100644..100755 --- a/camera/mm-camera-interface/mm_camera_channel.c +++ b/camera/mm-camera-interface/mm_camera_channel.c @@ -443,7 +443,7 @@ static int32_t mm_camera_ch_util_qbuf(mm_camera_obj_t *my_obj, cache_frame = val->snapshot.main.frame; CDBG("buffer fd = %d, length = %d, vaddr = %p\n", val->snapshot.main.frame->fd, val->snapshot.main.frame->ion_alloc.len, val->snapshot.main.frame->buffer); - if(!rc) { + if(!rc && (!my_obj->full_liveshot)) { if (my_obj->op_mode == MM_CAMERA_OP_MODE_ZSL) stream = &my_obj->ch[MM_CAMERA_CH_PREVIEW].preview.stream; else |