summaryrefslogtreecommitdiff
path: root/net/nfc/hci/llc_shdlc.c
diff options
context:
space:
mode:
authorSzymon Janc <szymon.janc@tieto.com>2012-10-17 15:23:39 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-10-26 18:26:52 +0200
commit0f450772224f99db3b8384bfb8f751889d0c4cb8 (patch)
treec2b0422af06a420d853aab206605e2bb86429afd /net/nfc/hci/llc_shdlc.c
parent7eda8b8e967781cfa5a04962502f9aa428f67e5f (diff)
NFC: Fix some code style and whitespace issues
Signed-off-by: Szymon Janc <szymon.janc@tieto.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/hci/llc_shdlc.c')
-rw-r--r--net/nfc/hci/llc_shdlc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index 01cbc72943cd..27b313befc35 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;