From 7adab1ffadb512d3e56e20873dbcc097dc4c803e Mon Sep 17 00:00:00 2001 From: Dotan Barak Date: Mon, 19 Nov 2012 12:52:44 +0200 Subject: [PATCH] net/mlx4_core: unmap clear register in case of error flow Clear interrupt clear register in case of error flows. Signed-off-by: Dotan Barak Reviewed-by: Yevgeny Petrilin (Ported from Mellanox OFED 2.4) Signed-off-by: Mukesh Kacker --- drivers/net/ethernet/mellanox/mlx4/eq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c index 2619c9fbf42d..b4b68d715c32 100644 --- a/drivers/net/ethernet/mellanox/mlx4/eq.c +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c @@ -1180,7 +1180,7 @@ int mlx4_init_eq_table(struct mlx4_dev *dev) GFP_KERNEL); if (!priv->eq_table.irq_names) { err = -ENOMEM; - goto err_out_bitmap; + goto err_out_clr_int; } for (i = 0; i < dev->caps.num_comp_vectors; ++i) { @@ -1280,9 +1280,11 @@ err_out_unmap: mlx4_free_eq(dev, &priv->eq_table.eq[i]); --i; } + mlx4_free_irqs(dev); + +err_out_clr_int: if (!mlx4_is_slave(dev)) mlx4_unmap_clr_int(dev); - mlx4_free_irqs(dev); err_out_bitmap: mlx4_unmap_uar(dev); -- 2.50.1