diff options
| author | Shubhraprakash Das <sadas@codeaurora.org> | 2016-11-11 10:45:27 -0800 |
|---|---|---|
| committer | Shubhraprakash Das <sadas@codeaurora.org> | 2016-12-01 23:52:55 -0800 |
| commit | afaeeaf0994a42151b34029a2ecb221e8b3303b0 (patch) | |
| tree | e11a31664899148caa6aed2e14c3240471022bf4 | |
| parent | 4d0a1adb9648680b82fec02703c9f7f452dc8e91 (diff) | |
msm: camera: isp: Return success if buffer not available
If buffer is not available during stream start then do not treat
that as an error.
CRs-Fixed: 1087368
Change-Id: I8f56bbf621313676282e06449431d1961d4819eb
Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c index 37d9f5dfaca3..005dc9e2fb5f 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c @@ -2340,15 +2340,22 @@ static int msm_isp_init_stream_ping_pong_reg( /* Set address for both PING & PO NG register */ rc = msm_isp_cfg_ping_pong_address( stream_info, VFE_PING_FLAG); + /* No buffer available on start is not error */ + if (rc == -ENOMEM && stream_info->stream_type != BURST_STREAM) + return 0; if (rc < 0) { pr_err("%s: No free buffer for ping\n", __func__); return rc; } if (stream_info->stream_type != BURST_STREAM || - stream_info->runtime_num_burst_capture > 1) + stream_info->runtime_num_burst_capture > 1) { rc = msm_isp_cfg_ping_pong_address( stream_info, VFE_PONG_FLAG); + /* No buffer available on start is not error */ + if (rc == -ENOMEM) + return 0; + } if (rc < 0) { pr_err("%s: No free buffer for pong\n", |