summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-23 11:07:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-23 11:07:09 -0300
commit598bf8dbd0173ee6f112fe6259ea17888b9569ba (patch)
treeb5f8126976f125b5f84c67b536bbbfdfc3e14e1a /linux/drivers
parent2d4a291359262ee673bfedbdce319fd84f967b44 (diff)
downloadmediapointer-dvb-s2-598bf8dbd0173ee6f112fe6259ea17888b9569ba.tar.gz
mediapointer-dvb-s2-598bf8dbd0173ee6f112fe6259ea17888b9569ba.tar.bz2
saa7134: fix: Properly handle busy states on i2c bus
From: Dmitry Belimov <d.belimov@gmail.com> There are two conditions, reported by saa7134 that indicates that the I2C bus is busy: TO_SCL and TO_ARB. On both states, it needs to wait for I2C release, before using the bus. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-i2c.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c
index fda6d44cd..ecf0e3443 100644
--- a/linux/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c
@@ -140,6 +140,8 @@ static inline int i2c_is_busy(enum i2c_status status)
{
switch (status) {
case BUSY:
+ case TO_SCL:
+ case TO_ARB:
return true;
default:
return false;