diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-05 03:48:15 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-05 03:48:15 +0100 |
| commit | 15ab90f400781a801017ea2bd8597e6eb3f39f79 (patch) | |
| tree | 561d350474e9eeecf4e0364291366b193460c974 /net/nfc/nci/hci.c | |
| parent | udp: properly support MSG_PEEK with truncated buffers (diff) | |
| parent | NFC: nci: memory leak in nci_core_conn_create() (diff) | |
| download | linux-15ab90f400781a801017ea2bd8597e6eb3f39f79.tar.xz linux-15ab90f400781a801017ea2bd8597e6eb3f39f79.zip | |
Merge tag 'nfc-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.5 pull request
This is the first NFC pull request for 4.5 and it brings:
- A new driver for the STMicroelectronics ST95HF NFC chipset.
The ST95HF is an NFC digital transceiver with an embedded analog
front-end and as such relies on the Linux NFC digital
implementation. This is the 3rd user of the NFC digital stack.
- ACPI support for the ST st-nci and st21nfca drivers.
- A small improvement for the nfcsim driver, as we can now tune
the Rx delay through sysfs.
- A bunch of minor cleanups and small fixes from Christophe Ricard,
for a few drivers and the NFC core code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc/nci/hci.c')
| -rw-r--r-- | net/nfc/nci/hci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/nci/hci.c b/net/nfc/nci/hci.c index 2aedac15cb59..a0ab26d535dc 100644 --- a/net/nfc/nci/hci.c +++ b/net/nfc/nci/hci.c @@ -676,7 +676,7 @@ int nci_hci_connect_gate(struct nci_dev *ndev, break; default: pipe = nci_hci_create_pipe(ndev, dest_host, dest_gate, &r); - if (pipe < 0) + if (pipe == NCI_HCI_INVALID_PIPE) return r; pipe_created = true; break; |