summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorBryan Wu <pengw@nvidia.com>2013-10-08 15:36:33 -0700
committerBryan Wu <pengw@nvidia.com>2013-10-17 17:44:29 -0700
commit43bf1d763148ef90968ec53452da2262e21acb97 (patch)
tree141a4aabc3d35b423ec5d1ab11d75281f9be4407 /include/media
parent3525ee1d8c885ddb900a748c2e91be7455cbae45 (diff)
media: soc_camera_platform: add dev_priv field
.priv field is used by Tegra V4L2 SoC camera driver, so introduce a new field named .dev_priv. Bug 1377330 Change-Id: Id714dca05d7640175b3dc25f7ce582d76abbcaf4 Signed-off-by: Bryan Wu <pengw@nvidia.com> Reviewed-on: http://git-master/r/289328 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Allen Martin <amartin@nvidia.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/soc_camera.h2
-rw-r--r--include/media/soc_camera_platform.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index ff77d08c30fd..4584a0814e69 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -122,6 +122,7 @@ struct soc_camera_subdev_desc {
/* sensor driver private platform data */
void *drv_priv;
+ void *dev_priv;
/* Optional regulators that have to be managed on power on/off events */
struct regulator_bulk_data *regulators;
@@ -177,6 +178,7 @@ struct soc_camera_link {
unsigned long flags;
void *priv;
+ void *dev_priv;
/* Optional regulators that have to be managed on power on/off events */
struct regulator_bulk_data *regulators;
diff --git a/include/media/soc_camera_platform.h b/include/media/soc_camera_platform.h
index 1e5065dab430..5472e52b3105 100644
--- a/include/media/soc_camera_platform.h
+++ b/include/media/soc_camera_platform.h
@@ -40,7 +40,7 @@ static inline int soc_camera_platform_add(struct soc_camera_device *icd,
{
struct soc_camera_subdev_desc *ssdd =
(struct soc_camera_subdev_desc *)plink;
- struct soc_camera_platform_info *info = ssdd->drv_priv;
+ struct soc_camera_platform_info *info = ssdd->dev_priv;
int ret;
if (&icd->sdesc->subdev_desc != ssdd)