diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-29 09:49:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-29 09:49:55 +0300 |
| commit | b8f8be3f043d6dba7d6c3426e4597d2ebf5a3547 (patch) | |
| tree | 8f2b80088b24b7c5fb0aba4c6b3b45b5ca4a2bb2 /drivers/nfc/st21nfcb/ndlc.c | |
| parent | ff660f75be36e6db75d45dc742a4a468c5a9c20d (diff) | |
| parent | 0a5942c8e1480db4b8ee7a8d643e4945ef2f8fed (diff) | |
| download | linux-b8f8be3f043d6dba7d6c3426e4597d2ebf5a3547.tar.xz | |
Merge tag 'nfc-next-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
NFC: 3.20 first pull request
This is the first NFC pull request for 3.20.
With this one we have:
- Secure element support for the ST Micro st21nfca driver. This depends
on a few HCI internal changes in order for example to support more
than one secure element per controller.
- ACPI support for NXP's pn544 HCI driver. This controller is found on
many x86 SoCs and is typically enumerated on the ACPI bus there.
- A few st21nfca and st21nfcb fixes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc/st21nfcb/ndlc.c')
| -rw-r--r-- | drivers/nfc/st21nfcb/ndlc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nfc/st21nfcb/ndlc.c b/drivers/nfc/st21nfcb/ndlc.c index bac50e805f1d..5fbf59d2138c 100644 --- a/drivers/nfc/st21nfcb/ndlc.c +++ b/drivers/nfc/st21nfcb/ndlc.c @@ -138,7 +138,7 @@ static void llt_ndlc_requeue_data_pending(struct llt_ndlc *ndlc) default: pr_err("UNKNOWN Packet Control Byte=%d\n", pcb); kfree_skb(skb); - break; + continue; } skb_queue_head(&ndlc->send_q, skb); } @@ -297,6 +297,5 @@ void ndlc_remove(struct llt_ndlc *ndlc) skb_queue_purge(&ndlc->send_q); st21nfcb_nci_remove(ndlc->ndev); - kfree(ndlc); } EXPORT_SYMBOL(ndlc_remove); |