Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 222063
b: refs/heads/master
c: 399d846
h: refs/heads/master
i:
  222061: 7b1be8a
  222059: dd5509e
  222055: bc9425f
  222047: 26c0d4a
v: v3
  • Loading branch information
Daniel Drake authored and Mauro Carvalho Chehab committed Nov 9, 2010
1 parent 6b69bd7 commit efd33ed
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 35bbe587d0959712b69540077c9e0fd27d3e6baf
refs/heads/master: 399d84655648b052c03301a71caa33758d906c2e
5 changes: 3 additions & 2 deletions trunk/drivers/media/video/cafe_ccic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit efd33ed

Please sign in to comment.