From 4907a3a4fed84638feed996d99e4e64ece417d7c Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Thu, 4 Oct 2012 15:15:49 +0200 Subject: [PATCH] --- yaml --- r: 340946 b: refs/heads/master c: 0250ffc578ac26acbc8a43e8018f00b0b3989b84 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/nfc/hci/command.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 03b7351106f5..d0edb1465ad9 100644 --- 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 index e15dd684854b..07659cfd6d7b 100644 --- a/trunk/net/nfc/hci/command.c +++ b/trunk/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)