From e57f35fd130f4baefbf43fef54b44170b081349c Mon Sep 17 00:00:00 2001
From: Eugenia Emantayev <eugenia@mellanox.com>
Date: Wed, 5 Sep 2012 22:50:52 +0000
Subject: [PATCH] --- yaml --- r: 322755 b: refs/heads/master c:
 521130d11fd37b328543477df5522704a0e7cf2c h: refs/heads/master i:   322753:
 1cada83311c8b28b38e6701056a63366e6263f9e   322751:
 81b835fb8dd67e83d1cde236c97c297274b6338f v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/ethernet/mellanox/mlx4/main.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ba261303a5fa..5ebb43ad3a49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bef772eb06051f49e84c3168f189b65074f19c3d
+refs/heads/master: 521130d11fd37b328543477df5522704a0e7cf2c
diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/main.c b/trunk/drivers/net/ethernet/mellanox/mlx4/main.c
index 0fadac546b00..2f816c6aed72 100644
--- a/trunk/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/trunk/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;
 	}