aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vino.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-30 10:47:55 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:25 -0400
commit1792f68b0eb464a9bc84e7d182e2ab4d00541c8c (patch)
tree623d7e56231ef8dedc685e6b0511c63162313f7a /drivers/media/video/vino.c
parente6574f2fbecdb8af807169d345c10131ae060a88 (diff)
V4L/DVB (11375): v4l2: use v4l2_i2c_new_probed_subdev_addr where appropriate.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r--drivers/media/video/vino.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 94343758ff5f..4912696c4a74 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -4266,7 +4266,6 @@ static int vino_init_channel_settings(struct vino_channel_settings *vcs,
4266 4266
4267static int __init vino_module_init(void) 4267static int __init vino_module_init(void)
4268{ 4268{
4269 unsigned short addr[] = { 0, I2C_CLIENT_END };
4270 int ret; 4269 int ret;
4271 4270
4272 printk(KERN_INFO "SGI VINO driver version %s\n", 4271 printk(KERN_INFO "SGI VINO driver version %s\n",
@@ -4336,14 +4335,12 @@ static int __init vino_module_init(void)
4336 } 4335 }
4337 vino_init_stage++; 4336 vino_init_stage++;
4338 4337
4339 addr[0] = 0x45;
4340 vino_drvdata->decoder = 4338 vino_drvdata->decoder =
4341 v4l2_i2c_new_probed_subdev(&vino_drvdata->v4l2_dev, 4339 v4l2_i2c_new_probed_subdev_addr(&vino_drvdata->v4l2_dev,
4342 &vino_i2c_adapter, "saa7191", "saa7191", addr); 4340 &vino_i2c_adapter, "saa7191", "saa7191", 0x45);
4343 addr[0] = 0x2b;
4344 vino_drvdata->camera = 4341 vino_drvdata->camera =
4345 v4l2_i2c_new_probed_subdev(&vino_drvdata->v4l2_dev, 4342 v4l2_i2c_new_probed_subdev_addr(&vino_drvdata->v4l2_dev,
4346 &vino_i2c_adapter, "indycam", "indycam", addr); 4343 &vino_i2c_adapter, "indycam", "indycam", 0x2b);
4347 4344
4348 dprintk("init complete!\n"); 4345 dprintk("init complete!\n");
4349 4346