diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /drivers/media/video/cafe_ccic.c | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'drivers/media/video/cafe_ccic.c')
| -rw-r--r-- | drivers/media/video/cafe_ccic.c | 5 |
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, | |||
| 2065 | sensor_cfg.clock_speed = 45; | 2065 | sensor_cfg.clock_speed = 45; |
| 2066 | 2066 | ||
| 2067 | cam->sensor_addr = 0x42; | 2067 | cam->sensor_addr = 0x42; |
| 2068 | cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, &cam->i2c_adapter, | 2068 | cam->sensor = v4l2_i2c_new_subdev_cfg(&cam->v4l2_dev, &cam->i2c_adapter, |
| 2069 | NULL, "ov7670", cam->sensor_addr, NULL); | 2069 | "ov7670", "ov7670", 0, &sensor_cfg, cam->sensor_addr, |
| 2070 | NULL); | ||
| 2070 | if (cam->sensor == NULL) { | 2071 | if (cam->sensor == NULL) { |
| 2071 | ret = -ENODEV; | 2072 | ret = -ENODEV; |
| 2072 | goto out_smbus; | 2073 | goto out_smbus; |