---

yaml --- r: 315285 b: refs/heads/master c: a070c85 h: refs/heads/master i: 315283: 5ad17e9 v: v3
git-mirror · Jul 9, 2012 · 56bdb96 · 56bdb96
1 parent af6d7ab
commit 56bdb96
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccca0d6e8805f12fcda2e740c44afa7191923559
+refs/heads/master: a070c8591a503ec65e2c84ebaf3454e5cd76e3fe
diff --git a/trunk/net/nfc/hci/core.c b/trunk/net/nfc/hci/core.c
@@ -736,10 +736,17 @@ EXPORT_SYMBOL(nfc_hci_get_clientdata);
 
 static void nfc_hci_failure(struct nfc_hci_dev *hdev, int err)
 {
-	/*
-	 * TODO: lower layer has permanent failure.
-	 * complete potential HCI command or send an empty tag discovered event
-	 */
+	mutex_lock(&hdev->msg_tx_mutex);
+
+	if (hdev->cmd_pending_msg == NULL) {
+		nfc_driver_failure(hdev->ndev, err);
+		goto exit;
+	}
+
+	__nfc_hci_cmd_completion(hdev, err, NULL);
+
+exit:
+	mutex_unlock(&hdev->msg_tx_mutex);
 }
 
 void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err)