Merge "msm: ais: fix cci read return value issue" (42ead6fd) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/media/platform/msm/ais/cam_sensor_module/cam_cci/cam_cci_core.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -1513,14 +1513,16 @@ static int32_t cam_cci_read(struct v4l2_subdev *sd,
		} else {
		//If rd_done is complete with NACK wait until RESET_ACK
		//is received.
		rc = 0;
		if (cci_dev->cci_master_info[master].status == -EINVAL) {
		rc = wait_for_completion_timeout(
		&cci_dev->cci_master_info[master].reset_complete,
		CCI_TIMEOUT);
		}
		if (rc <= 0) {
		CAM_ERR(CAM_CCI,
		"wait_for_completion_timeout rc = %d, rc");
		} else
		rc = 0;
		}
		}