diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-19 03:35:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-19 03:35:42 -0700 |
| commit | 3c763dc33a18ddfa62b19dc75065bada25a06731 (patch) | |
| tree | b0a0fbc38913f7a7ba794b72b848a50306a9f56c | |
| parent | fc187e817f2f324418c20a758046ab2bfec6dfdf (diff) | |
| parent | 4c2c53834f2400280381924569e62df5feefeb6e (diff) | |
Merge "msm: camera: isp: Fix freeze of preview stream during CDS"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c | 7 |
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); |