diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-01 02:57:53 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:24 -0400 |
commit | e6574f2fbecdb8af807169d345c10131ae060a88 (patch) | |
tree | 9923d1065397b9796a476cac238bacbdf1d820d1 /drivers/media/video/cafe_ccic.c | |
parent | 868f985c2fb85b5f32785bb55a349d180a30f3d3 (diff) |
V4L/DVB (11373): v4l2-common: add explicit v4l2_device pointer as first arg to new_(probed)_subdev
The functions v4l2_i2c_new_subdev and v4l2_i2c_new_probed_subdev relied on
i2c_get_adapdata to return the v4l2_device. However, this is not always
possible on embedded platforms. So modify the API to pass the v4l2_device
pointer explicitly.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cafe_ccic.c')
-rw-r--r-- | drivers/media/video/cafe_ccic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 7abe94d9fb4c..5f582726985d 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -1954,7 +1954,7 @@ static int cafe_pci_probe(struct pci_dev *pdev, | |||
1954 | goto out_freeirq; | 1954 | goto out_freeirq; |
1955 | 1955 | ||
1956 | cam->sensor_addr = 0x42; | 1956 | cam->sensor_addr = 0x42; |
1957 | cam->sensor = v4l2_i2c_new_subdev(&cam->i2c_adapter, | 1957 | cam->sensor = v4l2_i2c_new_subdev(&cam->v4l2_dev, &cam->i2c_adapter, |
1958 | "ov7670", "ov7670", cam->sensor_addr); | 1958 | "ov7670", "ov7670", cam->sensor_addr); |
1959 | if (cam->sensor == NULL) { | 1959 | if (cam->sensor == NULL) { |
1960 | ret = -ENODEV; | 1960 | ret = -ENODEV; |