Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1dfe0a8 authored by David S. Miller's avatar David S. Miller
Browse files

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.
parents bfdc8dbd fb77ff4f

net/nfc/nci/uart.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}