diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-11 06:48:02 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-11 06:48:02 -0700 |
| commit | 6ce7c8ebb57f57efbcd85c1864d3960189a7fff1 (patch) | |
| tree | 1a2df4fda6ccefb371a7a9f6fee85d724798bf6e /drivers | |
| parent | a81797adfc404ac98dad71334c4e4ea757af8c05 (diff) | |
| parent | 687c848007b3e5b9f247a7b5359e6a417bd9627e (diff) | |
Merge "msm: isp: Fix isp recovery mechanism"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c index 8d65fe783221..5d31b9f21339 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c @@ -2225,8 +2225,6 @@ static void msm_vfe_iommu_fault_handler(struct iommu_domain *domain, mutex_lock(&vfe_dev->core_mutex); if (vfe_dev->vfe_open_cnt > 0) { - atomic_set(&vfe_dev->error_info.overflow_state, - HALT_ENFORCED); pr_err_ratelimited("%s: fault address is %lx\n", __func__, iova); msm_isp_process_iommu_page_fault(vfe_dev); |