diff options
| author | Jing Xiangfeng <jingxiangfeng@huawei.com> | 2020-10-26 15:06:37 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-10-30 04:02:34 -0400 |
| commit | 7ba08e81cb4aec9724ab7674a5de49e7a341062c (patch) | |
| tree | c094ab276a5c05cdbb7d7e6deb26ebeeeed02c02 | |
| parent | 7922460e33c81f41e0d2421417228b32e6fdbe94 (diff) | |
| download | linux-stable-7ba08e81cb4aec9724ab7674a5de49e7a341062c.tar.gz linux-stable-7ba08e81cb4aec9724ab7674a5de49e7a341062c.tar.bz2 linux-stable-7ba08e81cb4aec9724ab7674a5de49e7a341062c.zip | |
vdpa/mlx5: Fix error return in map_direct_mr()
Fix to return the variable "err" from the error handling case instead
of "ret".
Fixes: 94abbccdf291 ("vdpa/mlx5: Add shared memory registration code")
Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
Link: https://lore.kernel.org/r/20201026070637.164321-1-jingxiangfeng@huawei.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Eli Cohen <elic@nvidia.com>
Cc: stable@vger.kernel.org
Acked-by: Jason Wang <jasowang@redhat.com>
| -rw-r--r-- | drivers/vdpa/mlx5/core/mr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c index ef1c550f8266..4b6195666c58 100644 --- a/drivers/vdpa/mlx5/core/mr.c +++ b/drivers/vdpa/mlx5/core/mr.c @@ -239,7 +239,6 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr u64 paend; struct scatterlist *sg; struct device *dma = mvdev->mdev->device; - int ret; for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1); map; map = vhost_iotlb_itree_next(map, start, mr->end - 1)) { @@ -277,8 +276,8 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr done: mr->log_size = log_entity_size; mr->nsg = nsg; - ret = dma_map_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0); - if (!ret) + err = dma_map_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0); + if (!err) goto err_map; err = create_direct_mr(mvdev, mr); |