Message ID | 20210329195530.1053-1-digetx@gmail.com |
---|---|
State | Accepted |
Commit | c126f7c3b8c41f5ca146e52e70ae927e3be30060 |
Headers | show |
Series | [v1] i2c: Make i2c_recover_bus() to return -EBUSY if bus recovery unimplemented | expand |
On Mon, Mar 29, 2021 at 10:55:30PM +0300, Dmitry Osipenko wrote: > The i2c_recover_bus() returns -EOPNOTSUPP if bus recovery isn't wired up > by the bus driver, which the case for Tegra I2C driver for example. This > error code is then propagated to I2C client and might be confusing, thus > make i2c_recover_bus() to return -EBUSY instead. > > Suggested-by: Wolfram Sang <wsa@the-dreams.de> > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Applied to for-next, thanks!
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index f21362355973..7039b8a06f3a 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -249,7 +249,7 @@ EXPORT_SYMBOL_GPL(i2c_generic_scl_recovery); int i2c_recover_bus(struct i2c_adapter *adap) { if (!adap->bus_recovery_info) - return -EOPNOTSUPP; + return -EBUSY; dev_dbg(&adap->dev, "Trying i2c bus recovery\n"); return adap->bus_recovery_info->recover_bus(adap);
The i2c_recover_bus() returns -EOPNOTSUPP if bus recovery isn't wired up by the bus driver, which the case for Tegra I2C driver for example. This error code is then propagated to I2C client and might be confusing, thus make i2c_recover_bus() to return -EBUSY instead. Suggested-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- drivers/i2c/i2c-core-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)