diff --git a/[refs] b/[refs] index 758e507bb91a..8492b5249d85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 900994332675f84a9fbbb33ff089474614c7f2fe +refs/heads/master: addfabf98daad7b469ad788a622dbeab6aaaa330 diff --git a/trunk/include/net/nfc/hci.h b/trunk/include/net/nfc/hci.h index aca65a5a9d0d..95fc0c27578e 100644 --- a/trunk/include/net/nfc/hci.h +++ b/trunk/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/trunk/net/nfc/hci/core.c b/trunk/net/nfc/hci/core.c index 545c19f17536..ef5cd5c9e3fb 100644 --- a/trunk/net/nfc/hci/core.c +++ b/trunk/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);