Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87c89c89 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Return IRQ_NONE from irq handlers" into dev/msm-4.9-camx

parents 40672c77 ea32c78e

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.c

+2 −2
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ irqreturn_t cam_fd_hw_irq(int irq_num, void *data) 


	if (!fd_hw) {

		CAM_ERR(CAM_FD, "Invalid data in IRQ callback");

		return -EINVAL;

		return IRQ_NONE;

	}



	fd_core = (struct cam_fd_core *) fd_hw->core_info;
@@ -570,7 +570,7 @@ irqreturn_t cam_fd_hw_irq(int irq_num, void *data) 
		CAM_ERR(CAM_FD,

			"Invalid number of IRQs, value=0x%x, num_irqs=%d",

			reg_value, num_irqs);

		return -EINVAL;

		return IRQ_NONE;

	}



	trace_cam_irq_activated("FD", irq_type);

drivers/media/platform/msm/camera/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ irqreturn_t cam_lrme_hw_irq(int irq_num, void *data) 


	if (!data) {

		CAM_ERR(CAM_LRME, "Invalid data in IRQ callback");

		return -EINVAL;

		return IRQ_NONE;

	}



	lrme_hw = (struct cam_hw_info *)data;
@@ -1179,7 +1179,7 @@ irqreturn_t cam_lrme_hw_irq(int irq_num, void *data) 
		task = cam_req_mgr_workq_get_task(lrme_core->work);

		if (!task) {

			CAM_ERR(CAM_LRME, "no empty task available");

			return -ENOMEM;

			return IRQ_NONE;

		}

		work_data = (struct cam_lrme_hw_work_data *)task->payload;

		work_data->top_irq_status = top_irq_status;

drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ irqreturn_t cam_csiphy_irq(int irq_num, void *data) 


	if (!csiphy_dev) {

		CAM_ERR(CAM_CSIPHY, "Invalid Args");

		return -EINVAL;

		return IRQ_NONE;

	}



	soc_info = &csiphy_dev->soc_info;