diff options
| author |   Gal Pressman <galp@mellanox.com> | 2016-05-01 22:59:54 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-05-03 13:37:25 -0400 |
| commit | 5f8a02a441b861fd3b1b5135a1a6e1c13ee4bb33 (patch) | |
| tree | 3851fc58ba67d794496eea18d18868736fe9ba0c /drivers/net/ethernet/mellanox/mlx5/core/uar.c | |
| parent | netem: Segment GSO packets on enqueue (diff) | |
| download | linux-dev-5f8a02a441b861fd3b1b5135a1a6e1c13ee4bb33.tar.xz linux-dev-5f8a02a441b861fd3b1b5135a1a6e1c13ee4bb33.zip | |
net/mlx5: Unmap only the relevant IO memory mapping
When freeing UAR the driver tries to unmap uar->map and uar->bf_map
which are mutually exclusive thus always unmapping a NULL pointer.
Make sure we only call iounmap() once, for the actual mapping.
Fixes: 0ba422410bbf ('net/mlx5: Fix global UAR mapping')
Signed-off-by: Gal Pressman <galp@mellanox.com>
Reported-by: Doron Tsur <doront@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/uar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/uar.c b/drivers/net/ethernet/mellanox/mlx5/core/uar.c index 8ba080e441a1..5ff8af472bf5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/uar.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/uar.c @@ -269,8 +269,10 @@ EXPORT_SYMBOL(mlx5_alloc_map_uar); void mlx5_unmap_free_uar(struct mlx5_core_dev *mdev, struct mlx5_uar *uar) { - iounmap(uar->map); - iounmap(uar->bf_map); + if (uar->map) + iounmap(uar->map); + else + iounmap(uar->bf_map); mlx5_cmd_free_uar(mdev, uar->index); } EXPORT_SYMBOL(mlx5_unmap_free_uar); |