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

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

Merge "msm: camera: Resetting last flush req to zero in streamoff" into dev/msm-4.14-camx

parents 14f20ee2 d030495f

drivers/media/platform/msm/camera/cam_sensor_module/cam_actuator/cam_actuator_core.c

+1 −0
Original line number Diff line number Diff line
@@ -850,6 +850,7 @@ int32_t cam_actuator_driver_cmd(struct cam_actuator_ctrl_t *a_ctrl, 
						i2c_set->request_id, rc);

			}

		}

		a_ctrl->last_flush_req = 0;

		a_ctrl->cam_act_state = CAM_ACTUATOR_CONFIG;

	}

		break;

drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl, 
		}



		fctrl->func_tbl.flush_req(fctrl, FLUSH_ALL, 0);

		fctrl->last_flush_req = 0;

		fctrl->flash_state = CAM_FLASH_STATE_ACQUIRE;

		break;

	}

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c

+1 −0
Original line number Diff line number Diff line
@@ -827,6 +827,7 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
		}



		cam_sensor_release_per_frame_resource(s_ctrl);

		s_ctrl->last_flush_req = 0;

		s_ctrl->sensor_state = CAM_SENSOR_ACQUIRE;

		CAM_INFO(CAM_SENSOR,

			"CAM_STOP_DEV Success, sensor_id:0x%x,sensor_slave_addr:0x%x",