diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-08-01 11:48:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-08-01 11:48:47 +0300 |
| commit | 7b9069cd1859ed8d1c5c757ca21ec787f75f0029 (patch) | |
| tree | 5f73f0c130f7b3c888713262abcedd4392345cb7 /drivers/i2c/busses/i2c-virtio.c | |
| parent | 52f6acdff8ba609115430bb9d6c17e6db2173832 (diff) | |
| parent | 8f5ff9784f3262e6e85c68d86f8b7931827f2983 (diff) | |
| download | linux-rolling-lts.tar.xz | |
Merge v6.12.41linux-rolling-lts
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-virtio.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-virtio.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-virtio.c b/drivers/i2c/busses/i2c-virtio.c index 2a351f961b89..c8c40ff9765d 100644 --- a/drivers/i2c/busses/i2c-virtio.c +++ b/drivers/i2c/busses/i2c-virtio.c @@ -116,15 +116,16 @@ static int virtio_i2c_complete_reqs(struct virtqueue *vq, for (i = 0; i < num; i++) { struct virtio_i2c_req *req = &reqs[i]; - wait_for_completion(&req->completion); - - if (!failed && req->in_hdr.status != VIRTIO_I2C_MSG_OK) - failed = true; + if (!failed) { + if (wait_for_completion_interruptible(&req->completion)) + failed = true; + else if (req->in_hdr.status != VIRTIO_I2C_MSG_OK) + failed = true; + else + j++; + } i2c_put_dma_safe_msg_buf(reqs[i].buf, &msgs[i], !failed); - - if (!failed) - j++; } return j; |