summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-09-14 09:49:16 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 22:01:23 +0100
commit88307eb3c69c80a705072e68463d8f72005fc027 (patch)
tree5513daba6158185704d36d8b6b9b13a420c61482
parentV4L/DVB (6459): cx25840: convert to bus-based I2C API (diff)
downloadlinux-88307eb3c69c80a705072e68463d8f72005fc027.tar.xz
linux-88307eb3c69c80a705072e68463d8f72005fc027.zip
V4L/DVB (6460): v4l2-i2c-drv: add legacy_probe function pointer
Some devices do complicated tests whether the device can be probed or not. Add a legacy_probe function pointer to support that. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--include/media/v4l2-i2c-drv-legacy.h6
-rw-r--r--include/media/v4l2-i2c-drv.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h
index c059b32844c1..433c984eefa5 100644
--- a/include/media/v4l2-i2c-drv-legacy.h
+++ b/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/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
index 547db60d3640..bc61ab27779d 100644
--- a/include/media/v4l2-i2c-drv.h
+++ b/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;
};