diff options
| author | Eric Lapuyade <eric.lapuyade@intel.com> | 2012-05-07 12:31:14 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-15 17:28:00 -0400 |
| commit | addfabf98daad7b469ad788a622dbeab6aaaa330 (patch) | |
| tree | 252043c69754cb2c943530af909bdd567ddd9977 | |
| parent | 900994332675f84a9fbbb33ff089474614c7f2fe (diff) | |
| download | linux-3.10-addfabf98daad7b469ad788a622dbeab6aaaa330.tar.gz linux-3.10-addfabf98daad7b469ad788a622dbeab6aaaa330.tar.bz2 linux-3.10-addfabf98daad7b469ad788a622dbeab6aaaa330.zip | |
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 aca65a5a9d0..95fc0c27578 100644 --- a/include/net/nfc/hci.h +++ b/include/net/nfc/hci.h @@ -83,8 +83,6 @@ struct nfc_hci_dev { u8 gate2pipe[NFC_HCI_MAX_GATES]; bool poll_started; - struct nfc_target *targets; - int target_count; u8 sw_romlib; u8 sw_patch; diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c index 545c19f1753..ef5cd5c9e3f 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) targets->hci_reader_gate = gate; r = nfc_targets_found(hdev->ndev, targets, 1); - if (r < 0) - goto exit; - - kfree(hdev->targets); - hdev->targets = targets; - targets = NULL; - hdev->target_count = 1; exit: kfree(targets); |