From 409d834275cbc6cb065972e2586df69b0f920d47 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sat, 28 Mar 2009 21:34:43 +0100
Subject: [PATCH] --- yaml --- r: 137567 b: refs/heads/master c:
 8fcfef6e65c5b58e6482eae0b793319c8d9efd44 h: refs/heads/master i:   137565:
 cfb910b803a2e44bdaa6bc81d68548db819d8bd6   137563:
 f15f9a79deee82ed32b0aa764e743697096f23c5   137559:
 e7ec5d2646d81ebc248ec088e281ac7952a8ce46   137551:
 f2b8f1dcd1d456c70a0c0a2c841279ae14c9db53   137535:
 491e6bdbc28298bc5021d805f40427f5b301c2ba v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/i2c/algos/i2c-algo-bit.c | 4 +---
 trunk/drivers/i2c/algos/i2c-algo-pcf.c | 1 -
 trunk/drivers/i2c/i2c-core.c           | 5 +++++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a85c0a0c3f06..1b99a0f347e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 154d22b04ae1741c5fcfd5d747b813a9a279abff
+refs/heads/master: 8fcfef6e65c5b58e6482eae0b793319c8d9efd44
diff --git a/trunk/drivers/i2c/algos/i2c-algo-bit.c b/trunk/drivers/i2c/algos/i2c-algo-bit.c
index eb8f72ca02f4..d420cc5f5633 100644
--- a/trunk/drivers/i2c/algos/i2c-algo-bit.c
+++ b/trunk/drivers/i2c/algos/i2c-algo-bit.c
@@ -604,9 +604,7 @@ static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
 
 	/* register new adapter to i2c module... */
 	adap->algo = &i2c_bit_algo;
-
-	adap->timeout = 100;	/* default values, should	*/
-	adap->retries = 3;	/* be replaced by defines	*/
+	adap->retries = 3;
 
 	return 0;
 }
diff --git a/trunk/drivers/i2c/algos/i2c-algo-pcf.c b/trunk/drivers/i2c/algos/i2c-algo-pcf.c
index d31147e10774..7ce75775ec73 100644
--- a/trunk/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/trunk/drivers/i2c/algos/i2c-algo-pcf.c
@@ -423,7 +423,6 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
 
 	/* register new adapter to i2c module... */
 	adap->algo = &pcf_algo;
-	adap->timeout = 100;
 
 	if ((rval = pcf_init_8584(pcf_adap)))
 		return rval;
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index 456caa80bfd3..e361033815d3 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -459,6 +459,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
 		pr_debug("I2C adapter driver [%s] forgot to specify "
 			 "physical device\n", adap->name);
 	}
+
+	/* Set default timeout to 1 second if not already set */
+	if (adap->timeout == 0)
+		adap->timeout = HZ;
+
 	dev_set_name(&adap->dev, "i2c-%d", adap->nr);
 	adap->dev.release = &i2c_adapter_dev_release;
 	adap->dev.class = &i2c_adapter_class;