Skip to content

Commit 41d6f90

Browse files
TroyMitchell911Wolfram Sang
authored andcommitted
i2c: spacemit: ensure bus release check runs when wait_bus_idle() fails
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: 5ea5584 ("i2c: spacemit: add support for SpacemiT K1 SoC") Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Troy Mitchell <troy.mitchell@linux.spacemit.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
1 parent b492183 commit 41d6f90

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

drivers/i2c/busses/i2c-k1.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -476,12 +476,13 @@ static int spacemit_i2c_xfer(struct i2c_adapter *adapt, struct i2c_msg *msgs, in
476476
spacemit_i2c_enable(i2c);
477477

478478
ret = spacemit_i2c_wait_bus_idle(i2c);
479-
if (!ret)
479+
if (!ret) {
480480
ret = spacemit_i2c_xfer_msg(i2c);
481-
else if (ret < 0)
482-
dev_dbg(i2c->dev, "i2c transfer error: %d\n", ret);
483-
else
481+
if (ret < 0)
482+
dev_dbg(i2c->dev, "i2c transfer error: %d\n", ret);
483+
} else {
484484
spacemit_i2c_check_bus_release(i2c);
485+
}
485486

486487
spacemit_i2c_disable(i2c);
487488

0 commit comments

Comments
 (0)