i2c: i2c-pnx: Limit minimum jiffie timeout to 2
authorKevin Wells <kevin.wells@nxp.com>
Wed, 11 Nov 2009 23:28:13 +0000 (00:28 +0100)
committerBen Dooks <ben-linux@fluff.org>
Fri, 20 Nov 2009 00:25:41 +0000 (00:25 +0000)
Limit minimum jiffie timeout to 2 to prevent early timeout on systems
with low tick rates

Signed-off-by: Kevin Wells <kevin.wells@nxp.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
drivers/i2c/busses/i2c-pnx.c

index 6ff6c20f1e78d261d6543b4e633c53aa0f80325c..68c8233b6df0b9bfcad71895b5b9851ff0243c3e 100644 (file)
@@ -54,6 +54,9 @@ static inline void i2c_pnx_arm_timer(struct i2c_adapter *adap)
        struct timer_list *timer = &data->mif.timer;
        int expires = I2C_PNX_TIMEOUT / (1000 / HZ);
 
+       if (expires <= 1)
+               expires = 2;
+
        del_timer_sync(timer);
 
        dev_dbg(&adap->dev, "Timer armed at %lu plus %u jiffies.\n",