diff options
| author | Peter Griffin <peter.griffin@linaro.org> | 2016-05-11 17:24:44 +0100 |
|---|---|---|
| committer | Peter Griffin <peter.griffin@linaro.org> | 2016-05-11 17:24:44 +0100 |
| commit | bca4d528de8db0d236ab869a73512577c8d537c4 (patch) | |
| tree | c6ae61516c0e2912024b036c58095c06ce81b6ea | |
| parent | d7b239a7b67907dc04003a0ca1a5c9e19add4c0f (diff) | |
i2c-core: change required to only implement recovery callbacki2c-bus-recovery
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
| -rw-r--r-- | drivers/i2c/i2c-core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index e584d88ee337..52cc5298906a 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1594,10 +1594,12 @@ static int i2c_register_adapter(struct i2c_adapter *adap) bri->get_scl = get_scl_gpio_value; bri->set_scl = set_scl_gpio_value; - } else if (!bri->set_scl || !bri->get_scl) { + } else if (bri->recover_bus == i2c_generic_scl_recovery) { /* Generic SCL recovery */ - dev_err(&adap->dev, "No {get|set}_gpio() found, not using recovery\n"); - adap->bus_recovery_info = NULL; + if (!bri->set_scl || !bri->get_scl) { + dev_err(&adap->dev, "No {get|set}_scl() found, not using recovery\n"); + adap->bus_recovery_info = NULL; + } } } |