---

yaml --- r: 76331 b: refs/heads/master c: 88307eb h: refs/heads/master i: 76329: 4d827ad 76327: 67c9ced v: v3
git-mirror · Jan 25, 2008 · fbfb914 · fbfb914
1 parent 764d865
commit fbfb914
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a39275a3f2fc6fbdb876f5121d67d4b13310c5b
+refs/heads/master: 88307eb3c69c80a705072e68463d8f72005fc027
diff --git a/trunk/include/media/v4l2-i2c-drv-legacy.h b/trunk/include/media/v4l2-i2c-drv-legacy.h
@@ -29,6 +29,7 @@ struct v4l2_i2c_driver_data {
 	int (*remove)(struct i2c_client *client);
 	int (*suspend)(struct i2c_client *client, pm_message_t state);
 	int (*resume)(struct i2c_client *client);
+	int (*legacy_probe)(struct i2c_adapter *adapter);
 	int legacy_class;
 };
 
@@ -45,6 +46,11 @@ static int v4l2_i2c_drv_attach_legacy(struct i2c_adapter *adapter, int address,
 
 static int v4l2_i2c_drv_probe_legacy(struct i2c_adapter *adapter)
 {
+	if (v4l2_i2c_data.legacy_probe) {
+		if (v4l2_i2c_data.legacy_probe(adapter))
+			return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
+		return 0;
+	}
 	if (adapter->class & v4l2_i2c_data.legacy_class)
 		return i2c_probe(adapter, &addr_data, v4l2_i2c_drv_attach_legacy);
 	return 0;

diff --git a/trunk/include/media/v4l2-i2c-drv.h b/trunk/include/media/v4l2-i2c-drv.h
@@ -29,6 +29,7 @@ struct v4l2_i2c_driver_data {
 	int (*remove)(struct i2c_client *client);
 	int (*suspend)(struct i2c_client *client, pm_message_t state);
 	int (*resume)(struct i2c_client *client);
+	int (*legacy_probe)(struct i2c_adapter *adapter);
 	int legacy_class;
 };