---

yaml --- r: 306684 b: refs/heads/master c: addfabf h: refs/heads/master v: v3
git-mirror · May 15, 2012 · f8f2bcf · f8f2bcf
1 parent 584be05
commit f8f2bcf
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git 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
@@ -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
@@ -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);