From efd33edfc1287d082257bc9e66ded58a84422f1a Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Wed, 27 Oct 2010 10:45:32 -0300
Subject: [PATCH] --- yaml --- r: 222063 b: refs/heads/master c:
 399d84655648b052c03301a71caa33758d906c2e h: refs/heads/master i:   222061:
 7b1be8a91f1512572b654cddf8e1a59a39533871   222059:
 dd5509e15c2162a5be6e728ba76cb3f9d375347d   222055:
 bc9425f89ee57633e1af02af0577c4a3f728d415   222047:
 26c0d4a5f3dc79b2a5ae83307751ebabd414eac0 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/media/video/cafe_ccic.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0538642e72e7..f3c2fe6f223e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35bbe587d0959712b69540077c9e0fd27d3e6baf
+refs/heads/master: 399d84655648b052c03301a71caa33758d906c2e
diff --git a/trunk/drivers/media/video/cafe_ccic.c b/trunk/drivers/media/video/cafe_ccic.c
index 2934770dacc3..7bc36670071a 100644
--- a/trunk/drivers/media/video/cafe_ccic.c
+++ b/trunk/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;