aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorDmitry Belimov <d.belimov@gmail.com>2008-04-23 14:07:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:09:46 -0300
commit8fb737b7dc94e495be02c775afe1e7de0e06f3f5 (patch)
tree8136da08d833f128a4ebf80c4b781241e2d0bdd5 /drivers/media/video/saa7134
parent548899c76e101bdf6228569d6ee6992e8c20da76 (diff)
V4L/DVB (7676): saa7134: fix: Properly handle busy states on i2c bus
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 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-i2c.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index ba71dd0040b..2ccfaba0c49 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/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;