Merge "msm-camera:isp: Handle interrupts with zero values" (19d1e5f5) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1281,6 +1281,12 @@ irqreturn_t msm_isp_process_irq(int irq_num, void *data)

		vfe_dev->hw_info->vfe_ops.irq_ops.
		read_irq_status(vfe_dev, &irq_status0, &irq_status1);

		if ((irq_status0 == 0) && (irq_status1 == 0)) {
		pr_err_ratelimited("%s: irq_status0 & 1 are both 0\n",
		__func__);
		return IRQ_HANDLED;
		}
		vfe_dev->hw_info->vfe_ops.core_ops.
		get_error_mask(&error_mask0, &error_mask1);
		error_mask0 &= irq_status0;
		@@ -1294,7 +1300,7 @@ irqreturn_t msm_isp_process_irq(int irq_num, void *data)
		if ((irq_status0 == 0) && (irq_status1 == 0) &&
		(!((error_mask0 != 0) \|\| (error_mask1 != 0)) &&
		vfe_dev->error_info.error_count == 1)) {
		ISP_DBG("%s: irq_status0 & 1 are both 0!\n", __func__);
		ISP_DBG("%s: error_mask0/1 & error_count are set!\n", __func__);
		return IRQ_HANDLED;
		}