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

Commit 78870a01 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Handle actuator close before power down"

parents 38c52166 56245047

drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c

+7 −0
Original line number Diff line number Diff line
@@ -1584,6 +1584,13 @@ static int msm_actuator_close(struct v4l2_subdev *sd, 
	}

	kfree(a_ctrl->i2c_reg_tbl);

	a_ctrl->i2c_reg_tbl = NULL;

	if (a_ctrl->actuator_state == ACT_OPS_ACTIVE) {

		rc = msm_actuator_power_down(a_ctrl);

		if (rc < 0) {

			pr_err("%s:%d Actuator Power down failed\n",

				__func__, __LINE__);

		}

	}

	a_ctrl->actuator_state = ACT_DISABLE_STATE;

	mutex_unlock(a_ctrl->actuator_mutex);

	CDBG("Exit\n");

drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_5_hwreg.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static struct csiphy_reg_3ph_parms_t csiphy_v3_5_3ph = { 
	{0x15C, 0x23},

	{0x160, ULPM_WAKE_UP_TIMER_MODE},

	{0x164, 0x50},

	{0x168, 0xA0},

	{0x168, 0x70},

	{0x16C, 0x17},

	{0x170, 0x41},

	{0x174, 0x41},