diff -r 39c2d2041e6e linux/drivers/media/common/saa7146_i2c.c
--- a/linux/drivers/media/common/saa7146_i2c.c	Thu Jul 05 00:18:34 2007 +0200
+++ b/linux/drivers/media/common/saa7146_i2c.c	Mon Jul 09 23:55:55 2007 +0200
@@ -329,9 +329,9 @@ int saa7146_i2c_transfer(struct saa7146_
 				   completely for analog cards after an address error and trust
 				   the saa7146 address error detection. */
 				if ( -EREMOTEIO == err ) {
-					if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) {
-						goto out;
-					}
+//					if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) {
+//						goto out;
+//					}
 					address_err++;
 				}
 				DEB_I2C(("error while sending message(s). starting again.\n"));