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

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

Merge "msm: camera: fd: Fix the order of clearing and handling IRQs" into dev/msm-4.14-camx

parents 64c4b5c2 ab17b6ce

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

+4 −4
Original line number Diff line number Diff line
@@ -544,6 +544,10 @@ irqreturn_t cam_fd_hw_irq(int irq_num, void *data) 


	CAM_DBG(CAM_FD, "FD IRQ status 0x%x", reg_value);



	cam_fd_soc_register_write(soc_info, CAM_FD_REG_WRAPPER,

		hw_static_info->wrapper_regs.irq_clear,

		reg_value);



	if (reg_value & CAM_FD_IRQ_TO_MASK(CAM_FD_IRQ_HALT_DONE)) {

		complete_all(&fd_core->halt_complete);

		irq_type = CAM_FD_IRQ_HALT_DONE;
@@ -575,10 +579,6 @@ irqreturn_t cam_fd_hw_irq(int irq_num, void *data) 


	trace_cam_irq_activated("FD", irq_type);



	cam_fd_soc_register_write(soc_info, CAM_FD_REG_WRAPPER,

		hw_static_info->wrapper_regs.irq_clear,

		hw_static_info->irq_mask);



	if (irq_type == CAM_FD_IRQ_HALT_DONE) {

		/*

		 * Do not send HALT IRQ callback to Hw Mgr,