summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2010-09-27 01:01:51 +0200
committerMauro Carvalho Chehab2010-10-21 05:17:40 +0200
commit1a4aa920d0b49af2c0d9bbedb3bb75be4e174218 (patch)
treeb645fbabdc9c9b02a14b0ebbab7b71627ad44866 /drivers/media/video/cx231xx/cx231xx-cards.c
parent[media] cx231xx: properly implement URB control messages log (diff)
downloadkernel-qcow2-linux-1a4aa920d0b49af2c0d9bbedb3bb75be4e174218.tar.gz
kernel-qcow2-linux-1a4aa920d0b49af2c0d9bbedb3bb75be4e174218.tar.xz
kernel-qcow2-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.c2
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)