From c79746da254c850dd8b72ddad17a1dfcb23664e7 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Sat, 2 Jan 2010 11:30:36 +0100
Subject: [PATCH] --- yaml --- r: 186571 b: refs/heads/master c:
 acdfd0e088502dc225f594b5a5598cab53ffd375 h: refs/heads/master i:   186569:
 bc77348f5834d657a8da80273aeedb72a26c95ba   186567:
 79c65ef94076f6fe31eab436e0a3dc207128d6c8 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/batman-adv/hard-interface.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 03d8f4103d9e..d218c5a87ba0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23a51a8061567a47347ade59edf2a0bde0eece30
+refs/heads/master: acdfd0e088502dc225f594b5a5598cab53ffd375
diff --git a/trunk/drivers/staging/batman-adv/hard-interface.c b/trunk/drivers/staging/batman-adv/hard-interface.c
index e9cb977d0016..28d02f68a3f8 100644
--- a/trunk/drivers/staging/batman-adv/hard-interface.c
+++ b/trunk/drivers/staging/batman-adv/hard-interface.c
@@ -399,8 +399,7 @@ int hardif_add_interface(char *dev, int if_num)
 	return 1;
 
 out:
-	if (batman_if->packet_buff)
-		kfree(batman_if->packet_buff);
+	kfree(batman_if->packet_buff);
 	kfree(batman_if);
 	kfree(dev);
 	return -1;