Merge "msm: camera: sensor: Fix actuator power on for i2c device" (62bb1409) · Commits · e / devices / android_kernel_sony_msm8994

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

+13 −4

Original line number	Original line	Diff line number	Diff line
	@@ -506,10 +506,19 @@ static int32_t msm_actuator_vreg_control(struct msm_actuator_ctrl_t *a_ctrl,
	}		}

	for (i = 0; i < cnt; i++) {		for (i = 0; i < cnt; i++) {
			if (a_ctrl->act_device_type == MSM_CAMERA_PLATFORM_DEVICE) {
	rc = msm_camera_config_single_vreg(&(a_ctrl->pdev->dev),		rc = msm_camera_config_single_vreg(&(a_ctrl->pdev->dev),
	&vreg_cfg->cam_vreg[i],		&vreg_cfg->cam_vreg[i],
	(struct regulator **)&vreg_cfg->data[i],		(struct regulator **)&vreg_cfg->data[i],
	config);		config);
			} else if (a_ctrl->act_device_type ==
			MSM_CAMERA_I2C_DEVICE) {
			rc = msm_camera_config_single_vreg(
			&(a_ctrl->i2c_client.client->dev),
			&vreg_cfg->cam_vreg[i],
			(struct regulator **)&vreg_cfg->data[i],
			config);
			}
	}		}
	return rc;		return rc;
	}		}