msm: vcap: Pass device pointers to regulator_get()
Passing a device pointer instead of NULL as the first argument
to regulator_get() allows the device to be taken into account
when finding a matching regulator.
Change-Id: I8cb02e5dc3294090f2f81371fca64b82139756d7
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 705bdd4..5c191c3 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -1627,7 +1627,7 @@
FS_8X60(FS_VPE, "fs_vpe", NULL, &vpe_fs_data),
FS_8X60(FS_GFX3D, "vdd", "kgsl-3d0.0", &gfx3d_fs_data),
FS_8X60(FS_VED, "vdd", "msm_vidc.0", &ved_fs_data),
- FS_8X60(FS_VCAP, "fs_vcap", NULL, &vcap_fs_data),
+ FS_8X60(FS_VCAP, "vdd", "msm_vcap.0", &vcap_fs_data),
};
unsigned apq8064_num_footswitch __initdata = ARRAY_SIZE(apq8064_footswitch);
diff --git a/drivers/media/video/vcap_v4l2.c b/drivers/media/video/vcap_v4l2.c
index 670d0f8..219f7a0 100644
--- a/drivers/media/video/vcap_v4l2.c
+++ b/drivers/media/video/vcap_v4l2.c
@@ -537,9 +537,9 @@
.release = video_device_release,
};
-int vcap_reg_powerup(struct vcap_dev *dev)
+int vcap_reg_powerup(struct vcap_dev *dev, struct device *ddev)
{
- dev->fs_vcap = regulator_get(NULL, "fs_vcap");
+ dev->fs_vcap = regulator_get(ddev, "vdd");
if (IS_ERR(dev->fs_vcap)) {
pr_err("%s: Regulator FS_VCAP get failed %ld\n", __func__,
PTR_ERR(dev->fs_vcap));
@@ -715,7 +715,7 @@
{
int rc;
- rc = vcap_reg_powerup(dev);
+ rc = vcap_reg_powerup(dev, ddev);
if (rc < 0)
goto reg_failed;
rc = vcap_clk_powerup(dev, ddev);