On Mon, 24 Jan 2011 15:00:05 +0100, Jean Delvare wrote: > On Mon, 24 Jan 2011 13:40:26 +0100, Bernhard Walle wrote: > > Since the timeout in the struct i2c_adapter use jiffies as unit and a > > timeout should be independent of CONFIG_HZ, use a value of HZ/50 which > > is equal to the current value 2 for CONFIG_HZ=100. > > > > Signed-off-by: Bernhard Walle <walle@xxxxxxxxxxxxx> > > Acked-by: Jean Delvare <khali@xxxxxxxxxxxx> > > Ben, please apply. Ben, I can't see this fix in your tree, it seems it got lost? > > --- > > drivers/i2c/busses/i2c-octeon.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c > > index 4cffda5..d07e5c7 100644 > > --- a/drivers/i2c/busses/i2c-octeon.c > > +++ b/drivers/i2c/busses/i2c-octeon.c > > @@ -469,7 +469,7 @@ static struct i2c_adapter octeon_i2c_ops = { > > .owner = THIS_MODULE, > > .name = "OCTEON adapter", > > .algo = &octeon_i2c_algo, > > - .timeout = 2, > > + .timeout = HZ/50, > > }; > > > > /** > > -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html