diff options
author | Wolfram Sang <wsa@kernel.org> | 2023-04-24 12:50:20 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2023-04-24 12:50:20 +0200 |
commit | 38c87827ffd3c7e1dd61eee9a7dea13d487dc2ed (patch) | |
tree | e6bd1c3ae56823874a736c1512409c123c9a4219 /drivers/i2c/busses/i2c-xiic.c | |
parent | 9496fffcb28f39e0352779a0199b6e61861c9221 (diff) | |
parent | d663d93bb47e7ab45602b227701022d8aa16040a (diff) | |
download | linux-38c87827ffd3c7e1dd61eee9a7dea13d487dc2ed.tar.gz linux-38c87827ffd3c7e1dd61eee9a7dea13d487dc2ed.tar.bz2 linux-38c87827ffd3c7e1dd61eee9a7dea13d487dc2ed.zip |
Merge branch 'i2c/for-current' into i2c/for-mergewindow
This should have been in 6.3, but sadly I missed it.
Diffstat (limited to 'drivers/i2c/busses/i2c-xiic.c')
-rw-r--r-- | drivers/i2c/busses/i2c-xiic.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index e7d37eb20f2b..8a3d9817cb41 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c @@ -1164,7 +1164,7 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) err = xiic_start_xfer(i2c, msgs, num); if (err < 0) { dev_err(adap->dev.parent, "Error xiic_start_xfer\n"); - return err; + goto out; } err = wait_for_completion_timeout(&i2c->completion, XIIC_XFER_TIMEOUT); @@ -1178,6 +1178,8 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) err = (i2c->state == STATE_DONE) ? num : -EIO; } mutex_unlock(&i2c->lock); + +out: pm_runtime_mark_last_busy(i2c->dev); pm_runtime_put_autosuspend(i2c->dev); return err; |