git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
V4L/DVB (7676): saa7134: fix: Properly handle busy states on i2c bus
[safe/jmp/linux-2.6]
/
drivers
/
media
/
video
/
saa7134
/
saa7134-i2c.c
diff --git
a/drivers/media/video/saa7134/saa7134-i2c.c
b/drivers/media/video/saa7134/saa7134-i2c.c
index
ba71dd0
..
2ccfaba
100644
(file)
--- 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;