summaryrefslogtreecommitdiff
path: root/net/nfc/hci
diff options
context:
space:
mode:
authorEric Lapuyade <eric.lapuyade@intel.com>2012-05-02 11:37:19 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-07-09 16:42:06 -0400
commit1c215d79a18a22fc6c2a9ef8658d426bac492b58 (patch)
treed792cefd3a6b6dfd1a3abbe546f094dfb30dd5b0 /net/nfc/hci
parent5018e490c372d5ed0e0ced2f2471140bf5ba9b32 (diff)
downloadlinux-3.10-1c215d79a18a22fc6c2a9ef8658d426bac492b58.tar.gz
linux-3.10-1c215d79a18a22fc6c2a9ef8658d426bac492b58.tar.bz2
linux-3.10-1c215d79a18a22fc6c2a9ef8658d426bac492b58.zip
NFC: Remove an impossible HCI error case
nfc_hci_recv_frame can not be called with a NULL skb. Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/hci')
-rw-r--r--net/nfc/hci/core.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 1dc6485343b..1a009d554fd 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -735,16 +735,6 @@ void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb)
struct sk_buff *frag_skb;
int msg_len;
- if (skb == NULL) {
- /* TODO ELa: lower layer had permanent failure, need to
- * propagate that up
- */
-
- skb_queue_purge(&hdev->rx_hcp_frags);
-
- return;
- }
-
packet = (struct hcp_packet *)skb->data;
if ((packet->header & ~NFC_HCI_FRAGMENT) == 0) {
skb_queue_tail(&hdev->rx_hcp_frags, skb);