Merge "msm: camera:icp: Fix deadlock during ICP pagefault handling" into dev/msm-4.14-camx (a11f39a8) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/camera/cam_icp/cam_icp_context.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -45,12 +45,10 @@ static int cam_icp_context_dump_active_request(void *data, unsigned long iova,
		return -EINVAL;
		}

		mutex_lock(&ctx->ctx_mutex);

		if (ctx->state < CAM_CTX_ACQUIRED \|\| ctx->state > CAM_CTX_ACTIVATED) {
		CAM_ERR(CAM_ICP, "Invalid state icp ctx %d state %d",
		ctx->ctx_id, ctx->state);
		goto end;
		return -EINVAL;
		}

		CAM_INFO(CAM_ICP, "iommu fault for icp ctx %d state %d",
		@@ -71,8 +69,6 @@ static int cam_icp_context_dump_active_request(void *data, unsigned long iova,
		req->request_id, rc);
		}

		end:
		mutex_unlock(&ctx->ctx_mutex);
		return rc;
		}