evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: camera: isp: Return success if buffer not available

Browse source 
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>
This commit is contained in:
Shubhraprakash Das 2016-11-11 10:45:27 -08:00
parent 4d0a1adb96
commit afaeeaf099
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
View file

@ -2340,15 +2340,22 @@ static int msm_isp_init_stream_ping_pong_reg(
/* Set address for both PING & PO NG register */ /* Set address for both PING & PO NG register */
rc = msm_isp_cfg_ping_pong_address( rc = msm_isp_cfg_ping_pong_address(
stream_info, VFE_PING_FLAG); 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) { if (rc < 0) {
pr_err("%s: No free buffer for ping\n", pr_err("%s: No free buffer for ping\n",
__func__); __func__);
return rc; return rc;
} }
if (stream_info->stream_type != BURST_STREAM || 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( rc = msm_isp_cfg_ping_pong_address(
stream_info, VFE_PONG_FLAG); stream_info, VFE_PONG_FLAG);
/* No buffer available on start is not error */
if (rc == -ENOMEM)
return 0;
}
if (rc < 0) { if (rc < 0) {
pr_err("%s: No free buffer for pong\n", pr_err("%s: No free buffer for pong\n",