aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tw9910.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-12-11 09:31:35 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-16 06:27:19 -0500
commit0f4482940a75b52db931e1fff181c9d267e462d2 (patch)
treef1b354771394b99aaecbbf56e1c3d82b522b50a4 /drivers/media/video/tw9910.c
parent3fd7ceffddd52c2f8c004a7999ccb705d592cbfd (diff)
V4L/DVB (13650): soc-camera: switch drivers and platforms to use .priv in struct soc_camera_link
After this change drivers can be further extended to not fail, if they don't get platform data, but to use defaults. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tw9910.c')
-rw-r--r--drivers/media/video/tw9910.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 3cb9ba6caa41..35373d8bf6a0 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -955,10 +955,10 @@ static int tw9910_probe(struct i2c_client *client,
955 } 955 }
956 956
957 icl = to_soc_camera_link(icd); 957 icl = to_soc_camera_link(icd);
958 if (!icl) 958 if (!icl || !icl->priv)
959 return -EINVAL; 959 return -EINVAL;
960 960
961 info = container_of(icl, struct tw9910_video_info, link); 961 info = icl->priv;
962 962
963 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { 963 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
964 dev_err(&client->dev, 964 dev_err(&client->dev,
@@ -976,7 +976,7 @@ static int tw9910_probe(struct i2c_client *client,
976 v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops); 976 v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops);
977 977
978 icd->ops = &tw9910_ops; 978 icd->ops = &tw9910_ops;
979 icd->iface = info->link.bus_id; 979 icd->iface = icl->bus_id;
980 980
981 ret = tw9910_video_probe(icd, client); 981 ret = tw9910_video_probe(icd, client);
982 if (ret) { 982 if (ret) {