diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-27 11:39:10 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-27 11:39:10 -0300 |
commit | b6404404a48e37352cbec31aceb1aefa537b58fb (patch) | |
tree | da6d8d302f771446446c88b75a6c326a60511f35 /linux/drivers/media/dvb/ttpci/av7110_v4l.c | |
parent | 26cbffaaba504abd01e6378d5858b21421a3c713 (diff) | |
parent | d0ccc4154b14a4a997095cf4d7e32d2534636dd6 (diff) | |
download | mediapointer-dvb-s2-b6404404a48e37352cbec31aceb1aefa537b58fb.tar.gz mediapointer-dvb-s2-b6404404a48e37352cbec31aceb1aefa537b58fb.tar.bz2 |
merge: http://linuxtv.org/hg/~endriss/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110_v4l.c')
-rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_v4l.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_v4l.c b/linux/drivers/media/dvb/ttpci/av7110_v4l.c index 87afaebc0..76cca0032 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/linux/drivers/media/dvb/ttpci/av7110_v4l.c @@ -129,23 +129,25 @@ static struct v4l2_input inputs[4] = { static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data) { + struct av7110 *av7110 = dev->ext_priv; u8 buf[] = { 0x00, reg, data }; struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 3 }; dprintk(4, "dev: %p\n", dev); - if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1)) + if (1 != i2c_transfer(&av7110->i2c_adap, &msg, 1)) return -1; return 0; } static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4]) { + struct av7110 *av7110 = dev->ext_priv; struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 }; dprintk(4, "dev: %p\n", dev); - if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1)) + if (1 != i2c_transfer(&av7110->i2c_adap, &msg, 1)) return -1; return 0; } |