aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2012-09-24 02:07:07 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-24 18:17:28 -0400
commit4c0ba9ac4bf5f20ada774f5d181d03044e0147e7 (patch)
tree348f1e2f2ac7a97ec58921ff5f1ea8fa73fa3568 /net/nfc
parent12bfd1e8906637757a0bc42970f0fc11a9918019 (diff)
NFC: Fix typo negociating -> negotiating
Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/hci/llc_shdlc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index 3afde1ecd925..8f69d791dcb3 100644
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -31,7 +31,7 @@
31enum shdlc_state { 31enum shdlc_state {
32 SHDLC_DISCONNECTED = 0, 32 SHDLC_DISCONNECTED = 0,
33 SHDLC_CONNECTING = 1, 33 SHDLC_CONNECTING = 1,
34 SHDLC_NEGOCIATING = 2, 34 SHDLC_NEGOTIATING = 2,
35 SHDLC_HALF_CONNECTED = 3, 35 SHDLC_HALF_CONNECTED = 3,
36 SHDLC_CONNECTED = 4 36 SHDLC_CONNECTED = 4
37}; 37};
@@ -416,7 +416,7 @@ static void llc_shdlc_rcv_u_frame(struct llc_shdlc *shdlc,
416 switch (u_frame_modifier) { 416 switch (u_frame_modifier) {
417 case U_FRAME_RSET: 417 case U_FRAME_RSET:
418 switch (shdlc->state) { 418 switch (shdlc->state) {
419 case SHDLC_NEGOCIATING: 419 case SHDLC_NEGOTIATING:
420 case SHDLC_CONNECTING: 420 case SHDLC_CONNECTING:
421 /* 421 /*
422 * We sent RSET, but chip wants to negociate or we 422 * We sent RSET, but chip wants to negociate or we
@@ -457,7 +457,7 @@ static void llc_shdlc_rcv_u_frame(struct llc_shdlc *shdlc,
457 case U_FRAME_UA: 457 case U_FRAME_UA:
458 if ((shdlc->state == SHDLC_CONNECTING && 458 if ((shdlc->state == SHDLC_CONNECTING &&
459 shdlc->connect_tries > 0) || 459 shdlc->connect_tries > 0) ||
460 (shdlc->state == SHDLC_NEGOCIATING)) { 460 (shdlc->state == SHDLC_NEGOTIATING)) {
461 llc_shdlc_connect_complete(shdlc, 0); 461 llc_shdlc_connect_complete(shdlc, 0);
462 shdlc->state = SHDLC_CONNECTED; 462 shdlc->state = SHDLC_CONNECTED;
463 } 463 }
@@ -640,10 +640,10 @@ static void llc_shdlc_sm_work(struct work_struct *work)
640 mod_timer(&shdlc->connect_timer, jiffies + 640 mod_timer(&shdlc->connect_timer, jiffies +
641 msecs_to_jiffies(SHDLC_CONNECT_VALUE_MS)); 641 msecs_to_jiffies(SHDLC_CONNECT_VALUE_MS));
642 642
643 shdlc->state = SHDLC_NEGOCIATING; 643 shdlc->state = SHDLC_NEGOTIATING;
644 } 644 }
645 break; 645 break;
646 case SHDLC_NEGOCIATING: 646 case SHDLC_NEGOTIATING:
647 if (timer_pending(&shdlc->connect_timer) == 0) { 647 if (timer_pending(&shdlc->connect_timer) == 0) {
648 shdlc->state = SHDLC_CONNECTING; 648 shdlc->state = SHDLC_CONNECTING;
649 queue_work(system_nrt_wq, &shdlc->sm_work); 649 queue_work(system_nrt_wq, &shdlc->sm_work);