summaryrefslogtreecommitdiffstats
path: root/net/nfc/hci
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-08-28 21:02:40 +0800
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-25 00:17:24 +0200
commit33e5971358c37851137b264f815977507c016fac (patch)
tree8191d95d73574954ed9376a95bbbccefb20802c0 /net/nfc/hci
parentf2ce39828abd556814366c2483191a7213c764f2 (diff)
downloadop-kernel-dev-33e5971358c37851137b264f815977507c016fac.zip
op-kernel-dev-33e5971358c37851137b264f815977507c016fac.tar.gz
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/hci')
-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 03646be..15744c0 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 39b51ea..824fb09 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)
OpenPOWER on IntegriCloud