From f5b41cce7e7cd1ece78088f95d44c3dc376a9493 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 10 Jan 2011 22:11:23 +0100 Subject: [PATCH] --- yaml --- r: 228470 b: refs/heads/master c: af5a60baaee66e2f891dbb9a8519ca28ab7da7cd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/algos/i2c-algo-bit.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7beed88c5cd4..a0ecd522ef22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f451171c5ac829e55581c81caf2cb01e1c0a5c5f +refs/heads/master: af5a60baaee66e2f891dbb9a8519ca28ab7da7cd diff --git a/trunk/drivers/i2c/algos/i2c-algo-bit.c b/trunk/drivers/i2c/algos/i2c-algo-bit.c index 938170b8998b..38319a69bd0a 100644 --- a/trunk/drivers/i2c/algos/i2c-algo-bit.c +++ b/trunk/drivers/i2c/algos/i2c-algo-bit.c @@ -604,9 +604,10 @@ static int __i2c_bit_add_bus(struct i2c_adapter *adap, int (*add_adapter)(struct i2c_adapter *)) { struct i2c_algo_bit_data *bit_adap = adap->algo_data; + int ret; if (bit_test) { - int ret = test_bus(bit_adap, adap->name); + ret = test_bus(bit_adap, adap->name); if (ret < 0) return -ENODEV; } @@ -615,7 +616,16 @@ static int __i2c_bit_add_bus(struct i2c_adapter *adap, adap->algo = &i2c_bit_algo; adap->retries = 3; - return add_adapter(adap); + ret = add_adapter(adap); + if (ret < 0) + return ret; + + /* Complain if SCL can't be read */ + if (bit_adap->getscl == NULL) { + dev_warn(&adap->dev, "Not I2C compliant: can't read SCL\n"); + dev_warn(&adap->dev, "Bus may be unreliable\n"); + } + return 0; } int i2c_bit_add_bus(struct i2c_adapter *adap)