dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

net/mlx4_core: Fixing error flow in case of QUERY_FW failure 

The order of operations was wrong on the teardown flow.

Signed-off-by: Aviad Yehezkel <aviadye@mellanox.com>
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Aviad Yehezkel 2012-09-05 22:50:51 +00:00 committed by David S. Miller
parent 60d31c1475
commit bef772eb06
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/mellanox/mlx4/main.c
View File

@ -1234,13 +1234,13 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
mlx4_info(dev, "non-primary physical function, skipping.\n");
else
mlx4_err(dev, "QUERY_FW command failed, aborting.\n");
goto unmap_bf;
return err;
}
err = mlx4_load_fw(dev);
if (err) {
mlx4_err(dev, "Failed to start FW, aborting.\n");
goto unmap_bf;
return err;
}
mlx4_cfg.log_pg_sz_m = 1;
@ -1304,7 +1304,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
err = mlx4_init_slave(dev);
if (err) {
mlx4_err(dev, "Failed to initialize slave\n");
goto unmap_bf;
return err;
}
err = mlx4_slave_cap(dev);
@ -1324,7 +1324,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
err = mlx4_QUERY_ADAPTER(dev, &adapter);
if (err) {
mlx4_err(dev, "QUERY_ADAPTER command failed, aborting.\n");
goto err_close;
goto unmap_bf;
}
priv->eq_table.inta_pin = adapter.inta_pin;
@ -1332,6 +1332,9 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
return 0;
unmap_bf:
unmap_bf_area(dev);
err_close:
mlx4_close_hca(dev);
@ -1344,8 +1347,6 @@ err_stop_fw:
mlx4_UNMAP_FA(dev);
mlx4_free_icm(dev, priv->fw.fw_icm, 0);
}
unmap_bf:
unmap_bf_area(dev);
return err;
}