Merge "msm: camera: csiphy: Add correct state check for hardware acquire" into dev/msm-4.14-camx (ff09257a) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -578,6 +578,14 @@ int32_t cam_csiphy_core_cfg(void *phy_dev,

		struct cam_create_dev_hdl bridge_params;

		if (csiphy_dev->csiphy_state == CAM_CSIPHY_START) {
		CAM_ERR(CAM_CSIPHY,
		"Not in right state to acquire : %d",
		csiphy_dev->csiphy_state);
		rc = -EINVAL;
		goto release_mutex;
		}

		rc = copy_from_user(&csiphy_acq_dev,
		u64_to_user_ptr(cmd->handle),
		sizeof(csiphy_acq_dev));