From: Szymon Janc Date: Thu, 4 Oct 2012 13:15:49 +0000 (+0200) Subject: NFC: Fix not propagating return code in nfc_hci_clear_all_pipes X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0250ffc578ac26acbc8a43e8018f00b0b3989b84;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: Samuel Ortiz --- 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)