i2c: Set a default timeout value for all adapters

[linux-2.6-omap-h63xx.git] / drivers / i2c / algos / i2c-algo-bit.c

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 35812823787bd7030f1cdc2452f923a9e06641a8..d420cc5f563313d81f1b0d2e816a9d44c98819ca 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -320,7 +320,7 @@ static int try_address(struct i2c_adapter *i2c_adap,
                       unsigned char addr, int retries)
 {
        struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
-       int i, ret = -1;
+       int i, ret = 0;
 
        for (i = 0; i <= retries; i++) {
                ret = i2c_outb(i2c_adap, addr);
@@ -508,7 +508,7 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                        addr ^= 1;
                ret = try_address(i2c_adap, addr, retries);
                if ((ret != 1) && !nak_ok)
-                       return -EREMOTEIO;
+                       return -ENXIO;
        }
 
        return 0;
@@ -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;
 }