diff options
| author | Simona Vetter <simona.vetter@ffwll.ch> | 2025-01-23 14:39:49 +0100 |
|---|---|---|
| committer | Simona Vetter <simona.vetter@ffwll.ch> | 2025-01-23 14:42:21 +0100 |
| commit | 07c5b277208cf9a9e9cf31bf0143977d7f030aa1 (patch) | |
| tree | 8c30e64d4b9bbb433e50785fb40860ee5c46a4eb /drivers/net/mctp/mctp-i3c.c | |
| parent | 951a6bf30667307e7901aac5e74e50dadd5ccfc7 (diff) | |
| parent | ffd294d346d185b70e28b1a28abe367bbfe53c04 (diff) | |
Merge v6.13 into drm-next
A regression was caused by commit e4b5ccd392b9 ("drm/v3d: Ensure job
pointer is set to NULL after job completion"), but this commit is not
yet in next-fixes, fast-forward it.
Note that this recreates Linus merge in 96c84703f1cf ("Merge tag
'drm-next-2025-01-17' of https://gitlab.freedesktop.org/drm/kernel")
because I didn't want to backmerge a random point in the merge window.
Signed-off-by: Simona Vetter <simona.vetter@ffwll.ch>
Diffstat (limited to 'drivers/net/mctp/mctp-i3c.c')
| -rw-r--r-- | drivers/net/mctp/mctp-i3c.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/mctp/mctp-i3c.c b/drivers/net/mctp/mctp-i3c.c index 9adad59b8676..d247fe483c58 100644 --- a/drivers/net/mctp/mctp-i3c.c +++ b/drivers/net/mctp/mctp-i3c.c @@ -125,6 +125,8 @@ static int mctp_i3c_read(struct mctp_i3c_device *mi) xfer.data.in = skb_put(skb, mi->mrl); + /* Make sure netif_rx() is read in the same order as i3c. */ + mutex_lock(&mi->lock); rc = i3c_device_do_priv_xfers(mi->i3c, &xfer, 1); if (rc < 0) goto err; @@ -166,8 +168,10 @@ static int mctp_i3c_read(struct mctp_i3c_device *mi) stats->rx_dropped++; } + mutex_unlock(&mi->lock); return 0; err: + mutex_unlock(&mi->lock); kfree_skb(skb); return rc; } |