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;