summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>2012-09-24 08:07:07 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-25 00:17:28 +0200
commit4c0ba9ac4bf5f20ada774f5d181d03044e0147e7 (patch)
tree348f1e2f2ac7a97ec58921ff5f1ea8fa73fa3568 /net/nfc
parent12bfd1e8906637757a0bc42970f0fc11a9918019 (diff)
downloadop-kernel-dev-4c0ba9ac4bf5f20ada774f5d181d03044e0147e7.zip
op-kernel-dev-4c0ba9ac4bf5f20ada774f5d181d03044e0147e7.tar.gz
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 3afde1e..8f69d79 100644
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -31,7 +31,7 @@
enum shdlc_state {
SHDLC_DISCONNECTED = 0,
SHDLC_CONNECTING = 1,
- SHDLC_NEGOCIATING = 2,
+ SHDLC_NEGOTIATING = 2,
SHDLC_HALF_CONNECTED = 3,
SHDLC_CONNECTED = 4
};
@@ -416,7 +416,7 @@ static void llc_shdlc_rcv_u_frame(struct llc_shdlc *shdlc,
switch (u_frame_modifier) {
case U_FRAME_RSET:
switch (shdlc->state) {
- case SHDLC_NEGOCIATING:
+ case SHDLC_NEGOTIATING:
case SHDLC_CONNECTING:
/*
* 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,
case U_FRAME_UA:
if ((shdlc->state == SHDLC_CONNECTING &&
shdlc->connect_tries > 0) ||
- (shdlc->state == SHDLC_NEGOCIATING)) {
+ (shdlc->state == SHDLC_NEGOTIATING)) {
llc_shdlc_connect_complete(shdlc, 0);
shdlc->state = SHDLC_CONNECTED;
}
@@ -640,10 +640,10 @@ static void llc_shdlc_sm_work(struct work_struct *work)
mod_timer(&shdlc->connect_timer, jiffies +
msecs_to_jiffies(SHDLC_CONNECT_VALUE_MS));
- shdlc->state = SHDLC_NEGOCIATING;
+ shdlc->state = SHDLC_NEGOTIATING;
}
break;
- case SHDLC_NEGOCIATING:
+ case SHDLC_NEGOTIATING:
if (timer_pending(&shdlc->connect_timer) == 0) {
shdlc->state = SHDLC_CONNECTING;
queue_work(system_nrt_wq, &shdlc->sm_work);
OpenPOWER on IntegriCloud