diff options
| author | Doug Ledford <dledford@redhat.com> | 2018-01-08 16:06:20 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2018-01-08 16:06:20 -0500 |
| commit | f8457d5832d882d8a74fe41a6ce70313a31b3e0e (patch) | |
| tree | c5d080c599c0f2aa8bd2ce522698242a540e6b88 /drivers/infiniband/hw/mlx4 | |
| parent | c4b76d8d95600d143f4d75f1bd700eb5d378099f (diff) | |
| parent | 2d67017cc78f1607bac5347ce0c5258734796faf (diff) | |
| download | op-kernel-dev-f8457d5832d882d8a74fe41a6ce70313a31b3e0e.zip op-kernel-dev-f8457d5832d882d8a74fe41a6ce70313a31b3e0e.tar.gz | |
Merge branch 'bart-srpt-for-next' into k.o/wip/dl-for-next
Merging in 12 patch series from Bart that required changes in the
current for-rc branch in order to apply cleanly.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx4')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c index 313bfb9..4975f3e 100644 --- a/drivers/infiniband/hw/mlx4/mr.c +++ b/drivers/infiniband/hw/mlx4/mr.c @@ -642,7 +642,6 @@ struct ib_mr *mlx4_ib_alloc_mr(struct ib_pd *pd, goto err_free_mr; mr->max_pages = max_num_sg; - err = mlx4_mr_enable(dev->dev, &mr->mmr); if (err) goto err_free_pl; @@ -653,6 +652,7 @@ struct ib_mr *mlx4_ib_alloc_mr(struct ib_pd *pd, return &mr->ibmr; err_free_pl: + mr->ibmr.device = pd->device; mlx4_free_priv_pages(mr); err_free_mr: (void) mlx4_mr_free(dev->dev, &mr->mmr); |
