diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2009-03-28 16:34:45 -0400 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2009-03-28 16:34:45 -0400 |
commit | 8e99ada8deaa9033600cd2c7d0a9366b0e99ab68 (patch) | |
tree | 20784a41011e58f7ba6497d7a3763781b8a3d460 /arch/sh | |
parent | eff9ec95efaaf6b12d230f0ea7d3c295d3bc9d57 (diff) |
i2c-algo-pca: Rework waiting for a free bus
Waiting for a free bus now accepts the timeout value in jiffies and does
proper checking using time_before.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/board-sh7785lcr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c index 94c0296bc35d..6f94f17adc46 100644 --- a/arch/sh/boards/board-sh7785lcr.c +++ b/arch/sh/boards/board-sh7785lcr.c | |||
@@ -229,7 +229,7 @@ static struct resource i2c_resources[] = { | |||
229 | static struct i2c_pca9564_pf_platform_data i2c_platform_data = { | 229 | static struct i2c_pca9564_pf_platform_data i2c_platform_data = { |
230 | .gpio = 0, | 230 | .gpio = 0, |
231 | .i2c_clock_speed = I2C_PCA_CON_330kHz, | 231 | .i2c_clock_speed = I2C_PCA_CON_330kHz, |
232 | .timeout = 100, | 232 | .timeout = HZ, |
233 | }; | 233 | }; |
234 | 234 | ||
235 | static struct platform_device i2c_device = { | 235 | static struct platform_device i2c_device = { |