diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-28 00:46:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-28 00:46:24 -0800 |
| commit | 2af6cac21a22f9f460a6ad58bf4eee92c1160fab (patch) | |
| tree | e6d124db09d138833dea950d7081bb408590d9a0 | |
| parent | 1508c1c08b8b273512b9e52f6e068e54c5334e43 (diff) | |
| parent | b3aa1cd08a5b31af166c5585f184a5990730b163 (diff) | |
Merge "msm: camera: isp: Do not halt vfe from tasklet"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c | 5 |
1 files changed, 0 insertions, 5 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 0db901de4562..af82b84f613f 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 @@ -1680,11 +1680,6 @@ void msm_isp_halt_send_error(struct vfe_device *vfe_dev, uint32_t event) temp_dev->hw_info->vfe_ops.core_ops. set_halt_restart_mask(temp_dev); } - /* heavy spin lock in axi halt, avoid spin lock outside. */ - msm_isp_axi_halt(vfe_dev, &halt_cmd); - if (temp_dev) - msm_isp_axi_halt(temp_dev, &halt_cmd); - error_event.frame_id = vfe_dev->axi_data.src_info[VFE_PIX_0].frame_id; |