The i2c_recover_bus() returns -EOPNOTSUPP if bus recovery isn't wired up,
which the case for older Tegra SoCs at the moment. This error code is then
propagated to I2C client and might be confusing, thus return -EIO instead.
Signed-off-by: Dmitry Osipenko <[email protected]>
---
drivers/i2c/busses/i2c-tegra.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index c883044715f3..cb5e3cc96160 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -1196,8 +1196,14 @@ static int tegra_i2c_error_recover(struct tegra_i2c_dev *i2c_dev,
/* start recovery upon arbitration loss in single master mode */
if (i2c_dev->msg_err == I2C_ERR_ARBITRATION_LOST) {
- if (!i2c_dev->multimaster_mode)
- return i2c_recover_bus(&i2c_dev->adapter);
+ if (!i2c_dev->multimaster_mode) {
+ int err = i2c_recover_bus(&i2c_dev->adapter);
+
+ if (err == -EOPNOTSUPP)
+ return -EIO;
+
+ return err;
+ }
return -EAGAIN;
}
--
2.30.2
On Mon, Mar 29, 2021 at 10:05:46PM +0300, Dmitry Osipenko wrote:
> The i2c_recover_bus() returns -EOPNOTSUPP if bus recovery isn't wired up,
> which the case for older Tegra SoCs at the moment. This error code is then
> propagated to I2C client and might be confusing, thus return -EIO instead.
Hmm, makes sense. Maybe we should change it in the core? But with EBUSY
instead?
29.03.2021 22:15, Wolfram Sang пишет:
> On Mon, Mar 29, 2021 at 10:05:46PM +0300, Dmitry Osipenko wrote:
>> The i2c_recover_bus() returns -EOPNOTSUPP if bus recovery isn't wired up,
>> which the case for older Tegra SoCs at the moment. This error code is then
>> propagated to I2C client and might be confusing, thus return -EIO instead.
>
> Hmm, makes sense. Maybe we should change it in the core? But with EBUSY
> instead?
>
This also should be a good variant. I'll update the patch, thanks.