On 2025-08-27 15:39, Troy Mitchell wrote:
> spacemit_i2c_wait_bus_idle() only returns 0 on success or a negative
> error code on failure.
>
> Since 'ret' can never be positive, the final 'else' branch was
> unreachable, and spacemit_i2c_check_bus_release() was never called.
>
> This commit guarantees we attempt to release the bus whenever waiting for
> an idle bus fails.
>
> Fixes: 5ea558473fa31 ("i2c: spacemit: add support for SpacemiT K1 SoC")
> Signed-off-by: Troy Mitchell <troy.mitchell@linux.spacemit.com>
> ---
> drivers/i2c/busses/i2c-k1.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-k1.c b/drivers/i2c/busses/i2c-k1.c
> index b68a21fff0b56b59fe2032ccb7ca6953423aad32..ee08811f4087c8e709d25dd314854ed643cc5a47 100644
> --- a/drivers/i2c/busses/i2c-k1.c
> +++ b/drivers/i2c/busses/i2c-k1.c
> @@ -476,12 +476,13 @@ static int spacemit_i2c_xfer(struct i2c_adapter *adapt, struct i2c_msg *msgs, in
> spacemit_i2c_enable(i2c);
>
> ret = spacemit_i2c_wait_bus_idle(i2c);
> - if (!ret)
> + if (!ret) {
> ret = spacemit_i2c_xfer_msg(i2c);
> - else if (ret < 0)
> - dev_dbg(i2c->dev, "i2c transfer error: %d\n", ret);
> - else
> + if (ret < 0)
> + dev_dbg(i2c->dev, "i2c transfer error: %d\n", ret);
> + } else {
> spacemit_i2c_check_bus_release(i2c);
> + }
>
> spacemit_i2c_disable(i2c);
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurelien@aurel32.net http://aurel32.net