summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-06-23 03:24:58 -0700
committerDavid S. Miller <davem@davemloft.net>2015-06-23 03:24:58 -0700
commitb1dfe0a80e49509bd34882a455ca625a5ae039ed (patch)
treeecc85135bf6a74b31b81b02206a67ab18c35ef29 /net
parentbfdc8dbdf840f2a96d7b4cbb73fc22d973c84441 (diff)
parentfb77ff4f43990dc91926ce2704036a547482544e (diff)
downloadlinux-b1dfe0a80e49509bd34882a455ca625a5ae039ed.tar.bz2
Merge tag 'nfc-next-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
NFC 4.2 2nd pull request This one only contains a one liner fix for a typo that I introduced while cleaning some of the nfcmrvl patches that were part of the 1st 4.2 pull request.
Diffstat (limited to 'net')
-rw-r--r--net/nfc/nci/uart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c
index 2c48810af5bb..21d8875673a4 100644
--- a/net/nfc/nci/uart.c
+++ b/net/nfc/nci/uart.c
@@ -417,7 +417,7 @@ int nci_uart_register(struct nci_uart *nu)
nu->ops.recv = nci_uart_default_recv;
/* Add this driver in the driver list */
- if (!nci_uart_drivers[nu->driver]) {
+ if (nci_uart_drivers[nu->driver]) {
pr_err("driver %d is already registered\n", nu->driver);
return -EBUSY;
}