Merge "msm: isp: Fix isp recovery mechanism"

This commit is contained in:
Linux Build Service Account 2017-05-11 06:48:02 -07:00 committed by Gerrit - the friendly Code Review server
commit 6ce7c8ebb5

View file

@ -2225,8 +2225,6 @@ static void msm_vfe_iommu_fault_handler(struct iommu_domain *domain,
mutex_lock(&vfe_dev->core_mutex); mutex_lock(&vfe_dev->core_mutex);
if (vfe_dev->vfe_open_cnt > 0) { 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", pr_err_ratelimited("%s: fault address is %lx\n",
__func__, iova); __func__, iova);
msm_isp_process_iommu_page_fault(vfe_dev); msm_isp_process_iommu_page_fault(vfe_dev);