Merge branch 'mlx5-next' into rdma.git for-next

[linux-2.6-block.git] / drivers / net / ethernet / mellanox / mlx5 / core / uar.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/uar.c b/drivers/net/ethernet/mellanox/mlx5/core/uar.c
index 94464723ff77de3c112fde55e61490675572c7e1..0d006224d7b057ecfdb9115f0835259ca1165494 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/uar.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/uar.c
@@ -79,7 +79,7 @@ static u64 uar2pfn(struct mlx5_core_dev *mdev, u32 index)
        else
                system_page_index = index;
 
-       return (pci_resource_start(mdev->pdev, 0) >> PAGE_SHIFT) + system_page_index;
+       return (mdev->bar_addr >> PAGE_SHIFT) + system_page_index;
 }
 
 static void up_rel_func(struct kref *kref)