diff options
| author |   Szymon Janc <szymon.janc@tieto.com> | 2012-10-04 15:15:49 +0200 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2012-10-26 18:26:49 +0200 |
| commit | 0250ffc578ac26acbc8a43e8018f00b0b3989b84 (patch) | |
| tree | aa08f8c6e82507820d3a1a04b7893a32305dfa51 /net/nfc | |
| parent | NFC: Small nfc_hci_create_pipe refactoring (diff) | |
| download | linux-dev-0250ffc578ac26acbc8a43e8018f00b0b3989b84.tar.xz linux-dev-0250ffc578ac26acbc8a43e8018f00b0b3989b84.zip | |
NFC: Fix not propagating return code in nfc_hci_clear_all_pipes
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>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/hci/command.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/nfc/hci/command.c b/net/nfc/hci/command.c index e15dd684854b..07659cfd6d7b 100644 --- a/net/nfc/hci/command.c +++ b/net/nfc/hci/command.c @@ -279,8 +279,6 @@ 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 @@ -288,10 +286,8 @@ static int nfc_hci_clear_all_pipes(struct nfc_hci_dev *hdev) 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) |