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.
This commit is contained in:
David S. Miller
2015-06-23 03:24:58 -07:00

View File

@@ -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;
}