Hi,

Below is a ObviouslyCorrect[tm] patch which fixes the i2c bus timeout
handling in the saa7146 driver.

Please apply,

  Gerd

==============================[ cut here ]==============================
diff -u linux-2.6.0-test10/drivers/media/common/saa7146_i2c.c 
linux/drivers/media/common/saa7146_i2c.c
--- linux-2.6.0-test10/drivers/media/common/saa7146_i2c.c       2003-11-26 
12:45:07.000000000 +0100
+++ linux/drivers/media/common/saa7146_i2c.c    2003-11-26 12:46:08.000000000 +0100
@@ -186,7 +186,7 @@
 {
        u32 status = 0, mc2 = 0;
        int trial = 0;
-       int timeout;
+       unsigned long timeout;
 
        /* write out i2c-command */
        DEB_I2C(("before: 0x%08x (status: 0x%08x), %d\n",*dword,saa7146_read(dev, 
I2C_STATUS), dev->i2c_op));
@@ -218,7 +218,7 @@
                        if( 0 != mc2 ) {
                                break;
                        }
-                       if (jiffies > timeout) {
+                       if (time_after(jiffies,timeout)) {
                                printk(KERN_WARNING "saa7146_i2c_writeout: timed out 
waiting for MC2\n");
                                return -EIO;
                        }
@@ -233,7 +233,7 @@
                        status = saa7146_i2c_status(dev);
                        if ((status & 0x3) != 1)
                                break;
-                       if (jiffies > timeout) {
+                       if (time_after(jiffies,timeout)) {
                                /* this is normal when probing the bus
                                 * (no answer from nonexisistant device...)
                                 */


-- 
Info:
To unsubscribe send a mail to [EMAIL PROTECTED] with "unsubscribe linux-dvb" as 
subject.

Reply via email to