Merge tag 'block-5.14-2021-07-08' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / net / nfc / hci / llc_shdlc.c

diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index c0c8fea..1e3a900 100644 (file)
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -406,7 +406,7 @@ static void llc_shdlc_rcv_u_frame(struct llc_shdlc *shdlc,
                case SHDLC_NEGOTIATING:
                case SHDLC_CONNECTING:
                        /*
-                        * We sent RSET, but chip wants to negociate or we
+                        * We sent RSET, but chip wants to negotiate or we
                         * got RSET before we managed to send out our.
                         */
                        if (skb->len > 0)