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

Commit 47aeb593 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 5b91f0e8 2fe9f37f

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

+7 −0
Original line number Diff line number Diff line
@@ -1573,6 +1573,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");