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

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

Merge "msm: camera: isp: Protect the evt_handler with lock" into dev/msm-4.9-camx

parents 77650916 4964e44e

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c

+1 −1
Original line number Diff line number Diff line
@@ -613,7 +613,6 @@ irqreturn_t cam_irq_controller_handle_irq(int irq_num, void *priv) 
					i, j, need_th_processing[j]);

		}

	}

	read_unlock(&controller->rw_lock);

	CAM_DBG(CAM_ISP, "unlocked controller %pK name %s rw_lock %pK",

		controller, controller->name, &controller->rw_lock);
@@ -632,6 +631,7 @@ irqreturn_t cam_irq_controller_handle_irq(int irq_num, void *priv) 
				&controller->th_list_head[i]);

		}

	}

	read_unlock(&controller->rw_lock);



	return IRQ_HANDLED;

}

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.c

+0 −2
Original line number Diff line number Diff line
@@ -507,8 +507,6 @@ int cam_vfe_stop(void *hw_priv, void *stop_args, uint32_t arg_size) 
			core_info->vfe_top->top_priv, isp_res,

			sizeof(struct cam_isp_resource_node));

	} else if (isp_res->res_type == CAM_ISP_RESOURCE_VFE_OUT) {

		cam_irq_controller_unsubscribe_irq(

			core_info->vfe_irq_controller, isp_res->irq_handle);

		rc = core_info->vfe_bus->hw_ops.stop(isp_res, NULL, 0);

	} else {

		CAM_ERR(CAM_ISP, "Invalid res type:%d", isp_res->res_type);