From 4ec74db7db26c533827738f438a5e3d09e483ec5 Mon Sep 17 00:00:00 2001
From: Mariusz Kozlowski <mk@lab.zgora.pl>
Date: Sun, 3 Apr 2011 22:04:01 -0700
Subject: [PATCH] --- yaml --- r: 243711 b: refs/heads/master c:
 a14b289d4614bb3b25d0455d68f72f3c7b4cc8e8 h: refs/heads/master i:   243709:
 f611c42a9ce4287a1f23baf2954b39a2d76d931c   243707:
 33b6988758736dbf507cf86a54c3993663cefeff   243703:
 44238c88aed451e16efd88f05f869f4c270fe776   243695:
 f368a0eedc4451c14fa7e7b34622e335dc7616ff   243679:
 77021b65ba1ee812a39cf4e5703a12cdbf60e163   243647:
 269b01072fb5eb0de5202476a4ecca29cdedde0b   243583:
 accd19051d6d5889fe219ded1f9dd1201527d241   243455:
 52c587e01eb751a345b56d240978782d066c9698   243199:
 c9c8f67b8e1dce082cbcaa32b97f8bbaca99ec65   242687:
 ad87400f1f2d361a5eca9370c4da3aa6495d5a1b   241663:
 83152cc060e8515b41cdeca93ae672cd223af763 v: v3

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

diff --git a/[refs] b/[refs]
index 8125486b40a6..2b22436158db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fceec13375e5d98ef033c6b0ee03943fc460950
+refs/heads/master: a14b289d4614bb3b25d0455d68f72f3c7b4cc8e8
diff --git a/trunk/drivers/net/mlx4/mcg.c b/trunk/drivers/net/mlx4/mcg.c
index 37150b2f6425..c6d336aed2d9 100644
--- a/trunk/drivers/net/mlx4/mcg.c
+++ b/trunk/drivers/net/mlx4/mcg.c
@@ -111,7 +111,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,
 	u32 members_count;
 	struct mlx4_steer_index *new_entry;
 	struct mlx4_promisc_qp *pqp;
-	struct mlx4_promisc_qp *dqp;
+	struct mlx4_promisc_qp *dqp = NULL;
 	u32 prot;
 	int err;
 	u8 pf_num;
@@ -184,7 +184,7 @@ static int new_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,
 out_alloc:
 	if (dqp) {
 		list_del(&dqp->list);
-		kfree(&dqp);
+		kfree(dqp);
 	}
 	list_del(&new_entry->list);
 	kfree(new_entry);