diff options
author | Steven Toth <stoth@kernellabs.com> | 2015-03-23 15:37:32 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-01 07:18:48 -0300 |
commit | 5f954b5be4bf42e85e0a204518499bda8ee2f419 (patch) | |
tree | cb1b03af3f77cbb5a5888b13a86a2ae2ef7c95d2 | |
parent | 5f5859d1c158b42343d343f5d1aa6de8643b8cf6 (diff) | |
download | linux-stable-5f954b5be4bf42e85e0a204518499bda8ee2f419.tar.gz linux-stable-5f954b5be4bf42e85e0a204518499bda8ee2f419.tar.bz2 linux-stable-5f954b5be4bf42e85e0a204518499bda8ee2f419.zip |
[media] saa7164: I2C improvements for upcoming HVR2255/2205 boards
SI2168/SI2157 issue single byte address reads. Add support
for these.
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-i2c.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/pci/saa7164/saa7164-i2c.c b/drivers/media/pci/saa7164/saa7164-i2c.c index 4f7e3b42263f..3b37c96d2a7c 100644 --- a/drivers/media/pci/saa7164/saa7164-i2c.c +++ b/drivers/media/pci/saa7164/saa7164-i2c.c @@ -39,9 +39,10 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) dprintk(DBGLVL_I2C, "%s(num = %d) addr = 0x%02x len = 0x%x\n", __func__, num, msgs[i].addr, msgs[i].len); if (msgs[i].flags & I2C_M_RD) { - /* Unsupported - Yet*/ - printk(KERN_ERR "%s() Unsupported - Yet\n", __func__); - continue; + retval = saa7164_api_i2c_read(bus, + msgs[i].addr, + 0 /* reglen */, + 0 /* reg */, msgs[i].len, msgs[i].buf); } else if (i + 1 < num && (msgs[i + 1].flags & I2C_M_RD) && msgs[i].addr == msgs[i + 1].addr) { /* write then read from same address */ |