diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-03-12 16:59:40 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-03-12 16:59:40 +0100 |
| commit | 8d99753ad93af6bcaf798232eeb15e60bdd7e94b (patch) | |
| tree | d1442504baf73be22d9e6bc1864206df5ccedfeb /drivers/infiniband/hw/mlx4/mr.c | |
| parent | 0e674a64b86e2bb00ab43f56104d3ea85dda0066 (diff) | |
| parent | b67416226a0cff3f49032de36906ad1ebe5694a0 (diff) | |
Merge tag 'v4.9.87' into fslc_4.9-1.0.x-imx
This is the 4.9.87 stable release
Conflicts:
drivers/dma/fsl-edma.c
Diffstat (limited to 'drivers/infiniband/hw/mlx4/mr.c')
| -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 5d73989d9771..ae41623e0f13 100644 --- a/drivers/infiniband/hw/mlx4/mr.c +++ b/drivers/infiniband/hw/mlx4/mr.c @@ -406,7 +406,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; @@ -417,6 +416,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); |