diff options
author | Eric Lapuyade <eric.lapuyade@intel.com> | 2012-05-07 06:31:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-05-15 17:28:00 -0400 |
commit | addfabf98daad7b469ad788a622dbeab6aaaa330 (patch) | |
tree | 252043c69754cb2c943530af909bdd567ddd9977 | |
parent | 900994332675f84a9fbbb33ff089474614c7f2fe (diff) |
NFC: Remove useless HCI private nfc target table
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | include/net/nfc/hci.h | 2 | ||||
-rw-r--r-- | net/nfc/hci/core.c | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h index aca65a5a9d0d..95fc0c27578e 100644 --- a/include/net/nfc/hci.h +++ b/include/net/nfc/hci.h | |||
@@ -83,8 +83,6 @@ struct nfc_hci_dev { | |||
83 | u8 gate2pipe[NFC_HCI_MAX_GATES]; | 83 | u8 gate2pipe[NFC_HCI_MAX_GATES]; |
84 | 84 | ||
85 | bool poll_started; | 85 | bool poll_started; |
86 | struct nfc_target *targets; | ||
87 | int target_count; | ||
88 | 86 | ||
89 | u8 sw_romlib; | 87 | u8 sw_romlib; |
90 | u8 sw_patch; | 88 | u8 sw_patch; |
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c index 545c19f17536..ef5cd5c9e3fb 100644 --- a/net/nfc/hci/core.c +++ b/net/nfc/hci/core.c | |||
@@ -235,13 +235,6 @@ static int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate) | |||
235 | targets->hci_reader_gate = gate; | 235 | targets->hci_reader_gate = gate; |
236 | 236 | ||
237 | r = nfc_targets_found(hdev->ndev, targets, 1); | 237 | r = nfc_targets_found(hdev->ndev, targets, 1); |
238 | if (r < 0) | ||
239 | goto exit; | ||
240 | |||
241 | kfree(hdev->targets); | ||
242 | hdev->targets = targets; | ||
243 | targets = NULL; | ||
244 | hdev->target_count = 1; | ||
245 | 238 | ||
246 | exit: | 239 | exit: |
247 | kfree(targets); | 240 | kfree(targets); |