aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/soc_camera.c1
-rw-r--r--drivers/media/video/soc_camera_platform.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index e8248ba0c03c..59aa7a3694c2 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -856,7 +856,6 @@ static int soc_camera_init_i2c(struct soc_camera_device *icd,
856 goto ei2cnd; 856 goto ei2cnd;
857 } 857 }
858 858
859 subdev->grp_id = (__u32)icd;
860 client = subdev->priv; 859 client = subdev->priv;
861 860
862 /* Use to_i2c_client(dev) to recover the i2c client */ 861 /* Use to_i2c_client(dev) to recover the i2c client */
diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/video/soc_camera_platform.c
index 1b6dd02a801f..b6a575ce5da2 100644
--- a/drivers/media/video/soc_camera_platform.c
+++ b/drivers/media/video/soc_camera_platform.c
@@ -137,7 +137,6 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
137 137
138 v4l2_subdev_init(&priv->subdev, &platform_subdev_ops); 138 v4l2_subdev_init(&priv->subdev, &platform_subdev_ops);
139 v4l2_set_subdevdata(&priv->subdev, p); 139 v4l2_set_subdevdata(&priv->subdev, p);
140 priv->subdev.grp_id = (__u32)icd;
141 strncpy(priv->subdev.name, dev_name(&pdev->dev), V4L2_SUBDEV_NAME_SIZE); 140 strncpy(priv->subdev.name, dev_name(&pdev->dev), V4L2_SUBDEV_NAME_SIZE);
142 141
143 ret = v4l2_device_register_subdev(&ici->v4l2_dev, &priv->subdev); 142 ret = v4l2_device_register_subdev(&ici->v4l2_dev, &priv->subdev);