diff options
| author | Jean Delvare <khali@linux-fr.org> | 2009-03-28 23:34:43 +0300 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-03-28 23:34:43 +0300 |
| commit | 8a52c6b4d55b2960d93a90a7cf6afd252357fa54 (patch) | |
| tree | bdc87e2591e4aa431389acba6efc45a7b620eb62 /drivers/i2c/busses/i2c-iop3xx.c | |
| parent | 8fcfef6e65c5b58e6482eae0b793319c8d9efd44 (diff) | |
| download | linux-8a52c6b4d55b2960d93a90a7cf6afd252357fa54.tar.xz | |
i2c: Adapter timeout is in jiffies
i2c_adapter.timeout is in jiffies. Fix all drivers which thought
otherwise. It didn't really matter as long as the value was only used
inside the driver, but soon i2c-core will use it too so it must have
the proper unit.
Note: for the i2c-mpc driver, this fixes a bug in polling mode.
Timeout would trigger after 1 jiffy, which is most probably not what
the author wanted.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Clifford Wolf <clifford@clifford.at>
Acked-by: Sean MacLennan <smaclennan@pikatech.com>
Cc: Stefan Roese <sr@denx.de>
Acked-by: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Mark A. Greer <mgreer@mvista.com>
Diffstat (limited to 'drivers/i2c/busses/i2c-iop3xx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index 3190690c26ce..a75c75e77b92 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c @@ -488,7 +488,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) /* * Default values...should these come in from board code? */ - new_adapter->timeout = 100; + new_adapter->timeout = HZ; new_adapter->algo = &iop3xx_i2c_algo; init_waitqueue_head(&adapter_data->waitq); |