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

Commit 68c3ad79 authored by Evgeniy Borisov's avatar Evgeniy Borisov
Browse files

msm: camera: Set correct I2c master dev 



Set correct i2c master device in actuator driver
probe function.

Change-Id: Ie63145c45068e0c1b4b1619d6e2bc31eb740a6f4
Signed-off-by: default avatarEvgeniy Borisov <eborisov@codeaurora.org>
parent 49494d24

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

+2 −2
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ static int32_t msm_actuator_platform_probe(struct platform_device *pdev) 
	rc = of_property_read_u32((&pdev->dev)->of_node, "qcom,cci-master",

		&msm_actuator_t->cci_master);

	CDBG("qcom,cci-master %d, rc %d\n", msm_actuator_t->cci_master, rc);

	if (rc < 0) {

	if (rc < 0 || msm_actuator_t->cci_master >= MASTER_MAX) {

		kfree(msm_actuator_t);

		pr_err("failed rc %d\n", rc);

		return rc;
@@ -1760,7 +1760,7 @@ static int32_t msm_actuator_platform_probe(struct platform_device *pdev) 


	cci_client = msm_actuator_t->i2c_client.cci_client;

	cci_client->cci_subdev = msm_cci_get_subdev();

	cci_client->cci_i2c_master = MASTER_MAX;

	cci_client->cci_i2c_master = msm_actuator_t->cci_master;

	v4l2_subdev_init(&msm_actuator_t->msm_sd.sd,

		msm_actuator_t->act_v4l2_subdev_ops);

	v4l2_set_subdevdata(&msm_actuator_t->msm_sd.sd, msm_actuator_t);