From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Tue, 28 Aug 2012 13:02:40 +0000 (+0800)
Subject: NFC: Remove pointless conditional before HCI kfree_skb()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=33e5971358c37851137b264f815977507c016fac;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

NFC: Remove pointless conditional before HCI kfree_skb()

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 03646beb3a7..15744c01bdd 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -398,8 +398,7 @@ disconnect_all:
 	nfc_hci_disconnect_all_gates(hdev);
 
 exit:
-	if (skb)
-		kfree_skb(skb);
+	kfree_skb(skb);
 
 	return r;
 }
diff --git a/net/nfc/hci/shdlc.c b/net/nfc/hci/shdlc.c
index 39b51eacc39..824fb09384e 100644
--- a/net/nfc/hci/shdlc.c
+++ b/net/nfc/hci/shdlc.c
@@ -241,8 +241,7 @@ static void nfc_shdlc_rcv_i_frame(struct nfc_shdlc *shdlc,
 	}
 
 exit:
-	if (skb)
-		kfree_skb(skb);
+	kfree_skb(skb);
 }
 
 static void nfc_shdlc_rcv_ack(struct nfc_shdlc *shdlc, int y_nr)