diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-26 20:01:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:17:40 -0200 |
| commit | 1a4aa920d0b49af2c0d9bbedb3bb75be4e174218 (patch) | |
| tree | b645fbabdc9c9b02a14b0ebbab7b71627ad44866 /drivers/media/video/cx231xx/cx231xx-cards.c | |
| parent | 24c80b651b6e938ab8c41ffb2ca9896bca764e10 (diff) | |
| download | blackbird-op-linux-1a4aa920d0b49af2c0d9bbedb3bb75be4e174218.tar.gz blackbird-op-linux-1a4aa920d0b49af2c0d9bbedb3bb75be4e174218.zip | |
[media] cx231xx: properly use the right tuner i2c address
The driver has a field to indicate what bus is used by tuner and
by demod. However, this field were never used. On Pixelview,
it uses I2C 2 for tuner, instead of I2C 1.
drivers/media/video/cx231xx/cx231xx-cards.c
Acked-by: Sri Deevi <Srinivasa.Deevi@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-cards.c')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-cards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c index b516068b6edb..8e088db1a568 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/video/cx231xx/cx231xx-cards.c @@ -569,7 +569,7 @@ void cx231xx_card_setup(struct cx231xx *dev) /* Initialize the tuner */ if (dev->board.tuner_type != TUNER_ABSENT) { dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev, - &dev->i2c_bus[1].i2c_adap, + &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap, "tuner", "tuner", dev->tuner_addr, NULL); if (dev->sd_tuner == NULL) |
