aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/nfc/hci/llc_shdlc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index d54bfc51c693..a7931c7c57f2 100644
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -414,7 +414,8 @@ static void llc_shdlc_rcv_u_frame(struct llc_shdlc *shdlc,
414 414
415 switch (u_frame_modifier) { 415 switch (u_frame_modifier) {
416 case U_FRAME_RSET: 416 case U_FRAME_RSET:
417 if (shdlc->state == SHDLC_NEGOCIATING) { 417 if ((shdlc->state == SHDLC_NEGOCIATING) ||
418 (shdlc->state == SHDLC_CONNECTING)) {
418 /* we sent RSET, but chip wants to negociate */ 419 /* we sent RSET, but chip wants to negociate */
419 if (skb->len > 0) 420 if (skb->len > 0)
420 w = skb->data[0]; 421 w = skb->data[0];