1 files changed, 15 insertions, 23 deletions

diff --git a/net/nfc/hci/shdlc.c b/net/nfc/hci/shdlc.c
index 6b836e6242b7..6f840c18c892 100644
--- a/net/nfc/hci/shdlc.c
+++ b/net/nfc/hci/shdlc.c
@@ -340,15 +340,6 @@ static void nfc_shdlc_connect_complete(struct nfc_shdlc *shdlc, int r)
                 shdlc->state = SHDLC_CONNECTED;
         } else {
                 shdlc->state = SHDLC_DISCONNECTED;
-
-                /*
-                 * TODO: Could it be possible that there are pending
-                 * executing commands that are waiting for connect to complete
-                 * before they can be carried? As connect is a blocking
-                 * operation, it would require that the userspace process can
-                 * send commands on the same device from a second thread before
-                 * the device is up. I don't think that is possible, is it?
-                 */
         }
 
         shdlc->connect_result = r;
@@ -413,12 +404,12 @@ static void nfc_shdlc_rcv_u_frame(struct nfc_shdlc *shdlc,
                                 r = nfc_shdlc_connect_send_ua(shdlc);
                                 nfc_shdlc_connect_complete(shdlc, r);
                         }
-                } else if (shdlc->state > SHDLC_NEGOCIATING) {
+                } else if (shdlc->state == SHDLC_CONNECTED) {
                         /*
-                         * TODO: Chip wants to reset link
-                         * send ua, empty skb lists, reset counters
-                         * propagate info to HCI layer
+                         * Chip wants to reset link. This is unexpected and
+                         * unsupported.
                          */
+                        shdlc->hard_fault = -ECONNRESET;
                 }
                 break;
         case U_FRAME_UA:
@@ -523,10 +514,6 @@ static void nfc_shdlc_handle_send_queue(struct nfc_shdlc *shdlc)
 
                 r = shdlc->ops->xmit(shdlc, skb);
                 if (r < 0) {
-                        /*
-                         * TODO: Cannot send, shdlc machine is dead, we
-                         * must propagate the information up to HCI.
-                         */
                         shdlc->hard_fault = r;
                         break;
                 }
@@ -590,6 +577,11 @@ static void nfc_shdlc_sm_work(struct work_struct *work)
                 skb_queue_purge(&shdlc->ack_pending_q);
                 break;
         case SHDLC_CONNECTING:
+                if (shdlc->hard_fault) {
+                        nfc_shdlc_connect_complete(shdlc, shdlc->hard_fault);
+                        break;
+                }
+
                 if (shdlc->connect_tries++ < 5)
                         r = nfc_shdlc_connect_initiate(shdlc);
                 else
@@ -610,6 +602,11 @@ static void nfc_shdlc_sm_work(struct work_struct *work)
                 }
 
                 nfc_shdlc_handle_rcv_queue(shdlc);
+
+                if (shdlc->hard_fault) {
+                        nfc_shdlc_connect_complete(shdlc, shdlc->hard_fault);
+                        break;
+                }
                 break;
         case SHDLC_CONNECTED:
                 nfc_shdlc_handle_rcv_queue(shdlc);
@@ -637,10 +634,7 @@ static void nfc_shdlc_sm_work(struct work_struct *work)
                 }
 
                 if (shdlc->hard_fault) {
-                        /*
-                         * TODO: Handle hard_fault that occured during
-                         * this invocation of the shdlc worker
-                         */
+                        nfc_hci_driver_failure(shdlc->hdev, shdlc->hard_fault);
                 }
                 break;
         default:
@@ -923,8 +917,6 @@ void nfc_shdlc_free(struct nfc_shdlc *shdlc)
 {
         pr_debug("\n");
 
-        /* TODO: Check that this cannot be called while still in use */
-
         nfc_hci_unregister_device(shdlc->hdev);
         nfc_hci_free_device(shdlc->hdev);