summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorSrikanth Uyyala <suyyala@codeaurora.org>2018-03-16 12:59:01 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-18 03:36:35 -0700
commit4c2c53834f2400280381924569e62df5feefeb6e (patch)
tree46a71ab68193b90e4c4b97bab1216118173b9b95 /drivers/media
parent0d8bfae571deca20364d1e9ea8c160ae03485a91 (diff)
msm: camera: isp: Fix freeze of preview stream during CDS
Remove check of axi_cfg_update to allow stream update. Change-Id: I4010e27a8dd136eecc2880d5eb13d97e4d0ea46e Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c7
1 files changed, 0 insertions, 7 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 7079044526b2..fa116b180682 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
@@ -3722,13 +3722,6 @@ static int msm_isp_stream_axi_cfg_update(struct vfe_device *vfe_dev,
unsigned long flags;
int vfe_idx;
- if (atomic_read(&vfe_dev->axi_data.axi_cfg_update[
- SRC_TO_INTF(stream_info->stream_src)])) {
- pr_err("%s: Update in progress for vfe %d intf %d\n",
- __func__, vfe_dev->pdev->id,
- SRC_TO_INTF(stream_info->stream_src));
- return -EINVAL;
- }
spin_lock_irqsave(&stream_info->lock, flags);
if (stream_info->state != ACTIVE) {
spin_unlock_irqrestore(&stream_info->lock, flags);