From 36134f4bcb6153e34d946c5f9b42bfcde6d33c8c Mon Sep 17 00:00:00 2001
From: Syam Sidhardhan <syamsidhardh@gmail.com>
Date: Sun, 24 Feb 2013 23:20:05 +0000
Subject: [PATCH] --- yaml --- r: 358880 b: refs/heads/master c:
 c89d127128dba62458e956388fef7e5d728e1ded h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 077de3926cc2..8a6fab9854f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57d88cffc83a2120266bbe9e72cbba5bd5f33675
+refs/heads/master: c89d127128dba62458e956388fef7e5d728e1ded
diff --git a/trunk/drivers/infiniband/hw/mlx4/main.c b/trunk/drivers/infiniband/hw/mlx4/main.c
index e7d81c0d1ac5..3fdd1c17cef7 100644
--- a/trunk/drivers/infiniband/hw/mlx4/main.c
+++ b/trunk/drivers/infiniband/hw/mlx4/main.c
@@ -1601,8 +1601,7 @@ static void do_slave_init(struct mlx4_ib_dev *ibdev, int slave, int do_init)
 		spin_unlock_irqrestore(&ibdev->sriov.going_down_lock, flags);
 	}
 out:
-	if (dm)
-		kfree(dm);
+	kfree(dm);
 	return;
 }