From 0589fecad524b9fcef80ddd725863aa641ad9df4 Mon Sep 17 00:00:00 2001
From: Hartmut Birr <e9hack@googlemail.com>
Date: Wed, 1 Nov 2006 13:01:42 -0300
Subject: [PATCH] --- yaml --- r: 44115 b: refs/heads/master c:
 35e55255bbe1775c3cdb5d9cff494d72d5a49bf3 h: refs/heads/master i:   44113:
 298cefe1737e4a1f39241db97366dd6b9643cb3a   44111:
 8463ca87fd330f12460ece707fb2a5893f929122 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/common/saa7146_i2c.c | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 06d934d41d2e..344cf44bd6d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88bbdf74fcfa7ed1fd1a3c825ee5575752344326
+refs/heads/master: 35e55255bbe1775c3cdb5d9cff494d72d5a49bf3
diff --git a/trunk/drivers/media/common/saa7146_i2c.c b/trunk/drivers/media/common/saa7146_i2c.c
index 5297a365c928..8c85efc26527 100644
--- a/trunk/drivers/media/common/saa7146_i2c.c
+++ b/trunk/drivers/media/common/saa7146_i2c.c
@@ -189,13 +189,21 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d
 		saa7146_write(dev, I2C_TRANSFER, *dword);
 
 		dev->i2c_op = 1;
+		SAA7146_ISR_CLEAR(dev, MASK_16|MASK_17);
 		SAA7146_IER_ENABLE(dev, MASK_16|MASK_17);
 		saa7146_write(dev, MC2, (MASK_00 | MASK_16));
 
-		wait_event_interruptible(dev->i2c_wq, dev->i2c_op == 0);
-		if (signal_pending (current)) {
-			/* a signal arrived */
-			return -ERESTARTSYS;
+		timeout = HZ/100 + 1; /* 10ms */
+		timeout = wait_event_interruptible_timeout(dev->i2c_wq, dev->i2c_op == 0, timeout);
+		if (timeout == -ERESTARTSYS || dev->i2c_op) {
+			SAA7146_IER_DISABLE(dev, MASK_16|MASK_17);
+			SAA7146_ISR_CLEAR(dev, MASK_16|MASK_17);
+			if (timeout == -ERESTARTSYS)
+				/* a signal arrived */
+				return -ERESTARTSYS;
+
+			printk(KERN_WARNING "saa7146_i2c_writeout: timed out waiting for end of xfer\n");
+			return -EIO;
 		}
 		status = saa7146_read(dev, I2C_STATUS);
 	} else {