diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:02 +0100 |
| commit | 2cddb06cb020f02a69e4e065599c1e5aa8b4a5d1 (patch) | |
| tree | 411945066af7d953de11184b79b6acf0162964a6 /drivers/infiniband/core/cma.c | |
| parent | 7eb10bfbbae6025cb7b4bba3db0c1281eac05862 (diff) | |
| parent | 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 (diff) | |
| download | linux-next-2cddb06cb020f02a69e4e065599c1e5aa8b4a5d1.tar.gz linux-next-2cddb06cb020f02a69e4e065599c1e5aa8b4a5d1.zip | |
ASoC: Merge up fixes from Linus' tree
Gets us pine64plus back if nothing else.
Diffstat (limited to 'drivers/infiniband/core/cma.c')
| -rw-r--r-- | drivers/infiniband/core/cma.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 1ee87c3aaeab..9891c7dc2af5 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -4062,6 +4062,8 @@ static int resolve_prepare_src(struct rdma_id_private *id_priv, RDMA_CM_ADDR_QUERY))) return -EINVAL; + } else { + memcpy(cma_dst_addr(id_priv), dst_addr, rdma_addr_size(dst_addr)); } if (cma_family(id_priv) != dst_addr->sa_family) { |