diff options
author | Jean Delvare <khali@linux-fr.org> | 2009-02-24 13:19:49 -0500 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2009-02-24 13:19:49 -0500 |
commit | 082a4cf80966ebcd08bf775cd258171cdd85c1a1 (patch) | |
tree | 4963477c88ecbe7d8d33ac8412775dca4ebc2205 /drivers/i2c/busses/scx200_i2c.c | |
parent | cd97f39b7cdf1c8a9c9f52865eec795b7f0c811d (diff) |
i2c: Make sure i2c_algo_bit_data.timeout is HZ-independent
i2c_algo_bit_data.timeout is supposed to be in jiffies, so drivers
should use set this value in terms of HZ.
Ultimately I think this field should be discarded in favor of
i2c_adapter.timeout, but that's left for a future patch.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Lennert Buytenhek <kernel@wantstofly.org>
Acked-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
Diffstat (limited to 'drivers/i2c/busses/scx200_i2c.c')
-rw-r--r-- | drivers/i2c/busses/scx200_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c index 162b74a04886..42df0eca43d5 100644 --- a/drivers/i2c/busses/scx200_i2c.c +++ b/drivers/i2c/busses/scx200_i2c.c | |||
@@ -76,7 +76,7 @@ static struct i2c_algo_bit_data scx200_i2c_data = { | |||
76 | .getsda = scx200_i2c_getsda, | 76 | .getsda = scx200_i2c_getsda, |
77 | .getscl = scx200_i2c_getscl, | 77 | .getscl = scx200_i2c_getscl, |
78 | .udelay = 10, | 78 | .udelay = 10, |
79 | .timeout = 100, | 79 | .timeout = HZ, |
80 | }; | 80 | }; |
81 | 81 | ||
82 | static struct i2c_adapter scx200_i2c_ops = { | 82 | static struct i2c_adapter scx200_i2c_ops = { |