diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-10-30 08:09:48 (GMT) |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-30 08:09:48 (GMT) |
| commit | 6fb47de9cf1be4710fb9f364c500ff216fb47b34 (patch) | |
| tree | e638cd1de972e7120dff9200efe71ce1b4ca3805 /net/nfc/hci/llc_shdlc.c | |
| parent | 1041638f2bba0f1de75e66086d50fb1251d64dcf (diff) | |
| parent | ab3d59d265e772e734c36fe738809cb1a910f566 (diff) | |
| download | linux-fsl-qoriq-6fb47de9cf1be4710fb9f364c500ff216fb47b34.tar.xz | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/nfc/hci/llc_shdlc.c')
| -rw-r--r-- | net/nfc/hci/llc_shdlc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c index 01cbc72..27b313b 100644 --- a/net/nfc/hci/llc_shdlc.c +++ b/net/nfc/hci/llc_shdlc.c @@ -634,9 +634,9 @@ static void llc_shdlc_sm_work(struct work_struct *work) r = llc_shdlc_connect_initiate(shdlc); else r = -ETIME; - if (r < 0) + if (r < 0) { llc_shdlc_connect_complete(shdlc, r); - else { + } else { mod_timer(&shdlc->connect_timer, jiffies + msecs_to_jiffies(SHDLC_CONNECT_VALUE_MS)); @@ -682,9 +682,8 @@ static void llc_shdlc_sm_work(struct work_struct *work) llc_shdlc_handle_send_queue(shdlc); } - if (shdlc->hard_fault) { + if (shdlc->hard_fault) shdlc->llc_failure(shdlc->hdev, shdlc->hard_fault); - } break; default: break; |