Commit 7ba08e81 authored by Jing Xiangfeng's avatar Jing Xiangfeng Committed by Michael S. Tsirkin
Browse files

vdpa/mlx5: Fix error return in map_direct_mr() 



Fix to return the variable "err" from the error handling case instead
of "ret".

Fixes: 94abbccd ("vdpa/mlx5: Add shared memory registration code")
Signed-off-by: default avatarJing Xiangfeng <jingxiangfeng@huawei.com>
Link: https://lore.kernel.org/r/20201026070637.164321-1-jingxiangfeng@huawei.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarEli Cohen <elic@nvidia.com>
Cc: stable@vger.kernel.org
Acked-by: default avatarJason Wang <jasowang@redhat.com>
parent 7922460e

drivers/vdpa/mlx5/core/mr.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE