aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-08-28 09:02:40 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-24 18:17:24 -0400
commit33e5971358c37851137b264f815977507c016fac (patch)
tree8191d95d73574954ed9376a95bbbccefb20802c0 /net/nfc
parentf2ce39828abd556814366c2483191a7213c764f2 (diff)
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>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/hci/core.c3
-rw-r--r--net/nfc/hci/shdlc.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 03646beb3a73..15744c01bddc 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -398,8 +398,7 @@ disconnect_all:
398 nfc_hci_disconnect_all_gates(hdev); 398 nfc_hci_disconnect_all_gates(hdev);
399 399
400exit: 400exit:
401 if (skb) 401 kfree_skb(skb);
402 kfree_skb(skb);
403 402
404 return r; 403 return r;
405} 404}
diff --git a/net/nfc/hci/shdlc.c b/net/nfc/hci/shdlc.c
index 39b51eacc391..824fb09384ed 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,
241 } 241 }
242 242
243exit: 243exit:
244 if (skb) 244 kfree_skb(skb);
245 kfree_skb(skb);
246} 245}
247 246
248static void nfc_shdlc_rcv_ack(struct nfc_shdlc *shdlc, int y_nr) 247static void nfc_shdlc_rcv_ack(struct nfc_shdlc *shdlc, int y_nr)