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

Commit a30e2143 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: sensor: Set the default actuator_state to POWER_DOWN"

parents ce346c0d 23979694

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

+2 −1
Original line number Diff line number Diff line
@@ -1237,7 +1237,7 @@ static int32_t msm_actuator_platform_probe(struct platform_device *pdev) 
	msm_actuator_t->msm_sd.sd.entity.group_id = MSM_CAMERA_SUBDEV_ACTUATOR;

	msm_actuator_t->msm_sd.close_seq = MSM_SD_CLOSE_2ND_CATEGORY | 0x2;

	msm_sd_register(&msm_actuator_t->msm_sd);



	msm_actuator_t->actuator_state = ACTUATOR_POWER_DOWN;

	msm_actuator_v4l2_subdev_fops = v4l2_subdev_fops;

#ifdef CONFIG_COMPAT

	msm_actuator_v4l2_subdev_fops.compat_ioctl32 =
@@ -1245,6 +1245,7 @@ static int32_t msm_actuator_platform_probe(struct platform_device *pdev) 
#endif

	msm_actuator_t->msm_sd.sd.devnode->fops =

		&msm_actuator_v4l2_subdev_fops;



	CDBG("Exit\n");

	return rc;

}