3 files changed, 6 insertions, 4 deletions

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index eb8f72ca02f4..d420cc5f5633 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/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/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index d31147e10774..7ce75775ec73 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/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/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 456caa80bfd3..e361033815d3 100644
--- a/drivers/i2c/i2c-core.c
+++ b/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;