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>

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>
33e59713 · Wei Yongjun · Samuel Ortiz · f2ce3982 · 33e59713 · 33e59713
Commit 33e59713 authored Aug 28, 2012 by Wei Yongjun Committed by Samuel Ortiz Sep 25, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

net/nfc/hci/core.c net/nfc/hci/core.c +1 -2

net/nfc/hci/shdlc.c net/nfc/hci/shdlc.c +1 -2

No files found.
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -398,8 +398,7 @@ static int hci_dev_session_init(struct nfc_hci_dev *hdev)
 	nfc_hci_disconnect_all_gates(hdev);
 exit:
-	if (skb)
+	kfree_skb(skb);
-		kfree_skb(skb);
 	return r;
 }

--- 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)