Skip to content

Commit

Permalink
NFC: Fix not propagating return code in nfc_hci_clear_all_pipes
Browse files Browse the repository at this point in the history
Return code from nfc_hci_execute_cmd was not propagated to caller.

Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Szymon Janc authored and Samuel Ortiz committed Oct 26, 2012
1 parent 80e4232 commit 0250ffc
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions net/nfc/hci/command.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0250ffc

Please sign in to comment.