Commit 3a9ddaf4 authored by Wolfram Sang's avatar Wolfram Sang

i2c: only check scl functions when using generic recovery

A custom recovery function doesn't need these pointers to be populated
because it may work differently internally.
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Tested-by: default avatarPeter Griffin <peter.griffin@linaro.org>
parent ef51d3ff
...@@ -1594,10 +1594,12 @@ static int i2c_register_adapter(struct i2c_adapter *adap) ...@@ -1594,10 +1594,12 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
bri->get_scl = get_scl_gpio_value; bri->get_scl = get_scl_gpio_value;
bri->set_scl = set_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 */ /* Generic SCL recovery */
dev_err(&adap->dev, "No {get|set}_gpio() found, not using recovery\n"); if (!bri->set_scl || !bri->get_scl) {
adap->bus_recovery_info = NULL; dev_err(&adap->dev, "No {get|set}_scl() found, not using recovery\n");
adap->bus_recovery_info = NULL;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment