diff options
| author | Vaibhav Hiremath <hvaibhav@ti.com> | 2009-11-09 07:14:16 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:42:01 -0500 |
| commit | 14cbaafe6f8587aed632de747322cd3add421a76 (patch) | |
| tree | b1cc6f17b4ad452f504a083c515b2898f139cac2 /drivers/media | |
| parent | e53a70b4725f0a5e10e659c8352696548b9b9478 (diff) | |
V4L/DVB (13465): Davinci VPFE Capture: Take i2c adapter id through platform data
The I2C adapter ID is actually depends on Board and may vary, Davinci
uses id=1, but in case of AM3517 id=3.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/davinci/vpfe_capture.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index c704a2637683..86f7e75f12c5 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c | |||
| @@ -1978,8 +1978,7 @@ static __init int vpfe_probe(struct platform_device *pdev) | |||
| 1978 | platform_set_drvdata(pdev, vpfe_dev); | 1978 | platform_set_drvdata(pdev, vpfe_dev); |
| 1979 | /* set driver private data */ | 1979 | /* set driver private data */ |
| 1980 | video_set_drvdata(vpfe_dev->video_dev, vpfe_dev); | 1980 | video_set_drvdata(vpfe_dev->video_dev, vpfe_dev); |
| 1981 | i2c_adap = i2c_get_adapter(1); | 1981 | i2c_adap = i2c_get_adapter(vpfe_cfg->i2c_adapter_id); |
| 1982 | vpfe_cfg = pdev->dev.platform_data; | ||
| 1983 | num_subdevs = vpfe_cfg->num_subdevs; | 1982 | num_subdevs = vpfe_cfg->num_subdevs; |
| 1984 | vpfe_dev->sd = kmalloc(sizeof(struct v4l2_subdev *) * num_subdevs, | 1983 | vpfe_dev->sd = kmalloc(sizeof(struct v4l2_subdev *) * num_subdevs, |
| 1985 | GFP_KERNEL); | 1984 | GFP_KERNEL); |