aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-07-18 09:53:57 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 18:14:17 -0400
commit2744782ef15151469ddd1e28c14e4b2c950be6dd (patch)
tree790ea713a0d3ccabeccb7072f7ed728c90ca6ae1 /drivers/media
parent1858c99db41eec26bb33e6b67020a41705e83faf (diff)
[media] soc-camera: Pass the physical device to the power operation
There will be no soc_camera_device instance with a soc-camera device is used with a non soc-camera host, so we won't be able to pass the soc_camera_device fake platform device to board code. Pass the physical device instead. The argument is currently not used by any board file so this is safe. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/soc_camera.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index e7c6809d1dbe..b03ffecb7438 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -62,7 +62,7 @@ static int soc_camera_power_on(struct soc_camera_device *icd,
62 } 62 }
63 63
64 if (icl->power) { 64 if (icl->power) {
65 ret = icl->power(icd->pdev, 1); 65 ret = icl->power(icd->control, 1);
66 if (ret < 0) { 66 if (ret < 0) {
67 dev_err(icd->pdev, 67 dev_err(icd->pdev,
68 "Platform failed to power-on the camera.\n"); 68 "Platform failed to power-on the camera.\n");
@@ -78,7 +78,7 @@ static int soc_camera_power_on(struct soc_camera_device *icd,
78 78
79esdpwr: 79esdpwr:
80 if (icl->power) 80 if (icl->power)
81 icl->power(icd->pdev, 0); 81 icl->power(icd->control, 0);
82elinkpwr: 82elinkpwr:
83 regulator_bulk_disable(icl->num_regulators, 83 regulator_bulk_disable(icl->num_regulators,
84 icl->regulators); 84 icl->regulators);
@@ -95,7 +95,7 @@ static int soc_camera_power_off(struct soc_camera_device *icd,
95 return ret; 95 return ret;
96 96
97 if (icl->power) { 97 if (icl->power) {
98 ret = icl->power(icd->pdev, 0); 98 ret = icl->power(icd->control, 0);
99 if (ret < 0) { 99 if (ret < 0) {
100 dev_err(icd->pdev, 100 dev_err(icd->pdev,
101 "Platform failed to power-off the camera.\n"); 101 "Platform failed to power-off the camera.\n");