Merge "msm: camera: icp: release mutex properly in flush function" into dev/msm-4.14-camx (c3a44ea3) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -3850,11 +3850,9 @@ static int cam_icp_mgr_hw_flush(void hw_priv, void hw_flush_args)
		switch (flush_args->flush_type) {
		case CAM_FLUSH_TYPE_ALL:
		mutex_lock(&hw_mgr->hw_mgr_mutex);
		if (!hw_mgr->recovery) {
		if (flush_args->num_req_active) {
		if (!hw_mgr->recovery && flush_args->num_req_active) {
		mutex_unlock(&hw_mgr->hw_mgr_mutex);
		cam_icp_mgr_abort_handle(ctx_data);
		}
		} else {
		mutex_unlock(&hw_mgr->hw_mgr_mutex);
		}