diff --git a/[refs] b/[refs] index fc15073593d8..96885f0e0c3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96e324024b421b3753eb142d5d92fbe4ac5e7519 +refs/heads/master: 9010e39f508ee57dc9a7675073659cb9d019a802 diff --git a/trunk/net/nfc/hci/llc_shdlc.c b/trunk/net/nfc/hci/llc_shdlc.c index d54bfc51c693..a7931c7c57f2 100644 --- a/trunk/net/nfc/hci/llc_shdlc.c +++ b/trunk/net/nfc/hci/llc_shdlc.c @@ -414,7 +414,8 @@ static void llc_shdlc_rcv_u_frame(struct llc_shdlc *shdlc, switch (u_frame_modifier) { case U_FRAME_RSET: - if (shdlc->state == SHDLC_NEGOCIATING) { + if ((shdlc->state == SHDLC_NEGOCIATING) || + (shdlc->state == SHDLC_CONNECTING)) { /* we sent RSET, but chip wants to negociate */ if (skb->len > 0) w = skb->data[0];