---

yaml --- r: 340946 b: refs/heads/master c: 0250ffc h: refs/heads/master v: v3
git-mirror · Oct 26, 2012 · 4907a3a · 4907a3a
1 parent 5601ec9
commit 4907a3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80e4232ecbc96d01465aee132081daaa2c82e859
+refs/heads/master: 0250ffc578ac26acbc8a43e8018f00b0b3989b84
diff --git a/trunk/net/nfc/hci/command.c b/trunk/net/nfc/hci/command.c
@@ -279,19 +279,15 @@ static int nfc_hci_delete_pipe(struct nfc_hci_dev *hdev, u8 pipe)
 
 static int nfc_hci_clear_all_pipes(struct nfc_hci_dev *hdev)
 {
-	int r;
-
 	u8 param[2];
 
 	/* TODO: Find out what the identity reference data is
 	 * and fill param with it. HCI spec 6.1.3.5 */
 
 	pr_debug("\n");
 
-	r = nfc_hci_execute_cmd(hdev, NFC_HCI_ADMIN_PIPE,
-				NFC_HCI_ADM_CLEAR_ALL_PIPE, param, 2, NULL);
-
-	return 0;
+	return nfc_hci_execute_cmd(hdev, NFC_HCI_ADMIN_PIPE,
+				   NFC_HCI_ADM_CLEAR_ALL_PIPE, param, 2, NULL);
 }
 
 int nfc_hci_disconnect_gate(struct nfc_hci_dev *hdev, u8 gate)