summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenia Emantayev <eugenia@mellanox.com>2012-09-05 22:50:52 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-07 12:55:59 -0400
commit521130d11fd37b328543477df5522704a0e7cf2c (patch)
tree5459ca02c8b4a95d977bf9af2fff3e13d6bb35f3
parentbef772eb06051f49e84c3168f189b65074f19c3d (diff)
downloadlinux-3.10-521130d11fd37b328543477df5522704a0e7cf2c.tar.gz
linux-3.10-521130d11fd37b328543477df5522704a0e7cf2c.tar.bz2
linux-3.10-521130d11fd37b328543477df5522704a0e7cf2c.zip
net/mlx4_core: Return the error value in case of command initialization failure
If mlx4_cmd_init() failed, the init_one function returned success, although no resources were opened. Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com> Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 0fadac546b0..2f816c6aed7 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -1997,7 +1997,8 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
}
slave_start:
- if (mlx4_cmd_init(dev)) {
+ err = mlx4_cmd_init(dev);
+ if (err) {
mlx4_err(dev, "Failed to init command interface, aborting.\n");
goto err_sriov;
}