diff --git a/[refs] b/[refs]
index 59f781780d82..b649fe230cf4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 548899c76e101bdf6228569d6ee6992e8c20da76
+refs/heads/master: 8fb737b7dc94e495be02c775afe1e7de0e06f3f5
diff --git a/trunk/drivers/media/video/saa7134/saa7134-i2c.c b/trunk/drivers/media/video/saa7134/saa7134-i2c.c
index ba71dd0040be..2ccfaba0c490 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/trunk/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;