aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2009-03-28 16:34:45 -0400
committerJean Delvare <khali@linux-fr.org>2009-03-28 16:34:45 -0400
commit8e99ada8deaa9033600cd2c7d0a9366b0e99ab68 (patch)
tree20784a41011e58f7ba6497d7a3763781b8a3d460 /drivers/i2c/busses
parenteff9ec95efaaf6b12d230f0ea7d3c295d3bc9d57 (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 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-pca-isa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 0cc8017b3f64..b9403fdfb6d8 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -104,7 +104,7 @@ static struct i2c_adapter pca_isa_ops = {
104 .owner = THIS_MODULE, 104 .owner = THIS_MODULE,
105 .algo_data = &pca_isa_data, 105 .algo_data = &pca_isa_data,
106 .name = "PCA9564/PCA9665 ISA Adapter", 106 .name = "PCA9564/PCA9665 ISA Adapter",
107 .timeout = 100, 107 .timeout = HZ,
108}; 108};
109 109
110static int __devinit pca_isa_match(struct device *dev, unsigned int id) 110static int __devinit pca_isa_match(struct device *dev, unsigned int id)