summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cafe_ccic.c
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2010-10-27 15:45:32 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-11-09 16:18:04 +0100
commit399d84655648b052c03301a71caa33758d906c2e (patch)
treeffba4dbb761766aabb1d4d17a10ad0bf463477f8 /drivers/media/video/cafe_ccic.c
parent[media] saa7134: Fix autodetect for Behold A7 and H7 TV cards (diff)
downloadlinux-399d84655648b052c03301a71caa33758d906c2e.tar.xz
linux-399d84655648b052c03301a71caa33758d906c2e.zip
[media] cafe_ccic: fix subdev configuration
For some reason, commit 1aafeb30104a is missing one change that was included in the email submission. The sensor configuration must be passed down to the ov7670 subdev. Signed-off-by: Daniel Drake <dsd@laptop.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cafe_ccic.c')
-rw-r--r--drivers/media/video/cafe_ccic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 2934770dacc3..7bc36670071a 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -2065,8 +2065,9 @@ static int cafe_pci_probe(struct pci_dev *pdev,
sensor_cfg.clock_speed = 45;
cam->sensor_addr = 0x42;
- cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, &cam->i2c_adapter,
- NULL, "ov7670", cam->sensor_addr, NULL);
+ cam->sensor = v4l2_i2c_new_subdev_cfg(&cam->v4l2_dev, &cam->i2c_adapter,
+ "ov7670", "ov7670", 0, &sensor_cfg, cam->sensor_addr,
+ NULL);
if (cam->sensor == NULL) {
ret = -ENODEV;
goto out_smbus;