From 4053a128028293ac9485b0d449ceaf2e2d968543 Mon Sep 17 00:00:00 2001
From: Eric Lapuyade <eric.lapuyade@intel.com>
Date: Mon, 7 May 2012 12:31:31 +0200
Subject: [PATCH] --- yaml --- r: 306700 b: refs/heads/master c:
 03bed29e0501b5757ce62ebdb01829f7bd8d9819 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/include/net/nfc/hci.h |  2 --
 trunk/net/nfc/hci/core.c    | 21 ++++-----------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 104edfc10480..d8d5efc80b6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4333459fb71461b93d911cf5fbc5de4eb0ae3714
+refs/heads/master: 03bed29e0501b5757ce62ebdb01829f7bd8d9819
diff --git a/trunk/include/net/nfc/hci.h b/trunk/include/net/nfc/hci.h
index ae042008571e..4467c9460857 100644
--- a/trunk/include/net/nfc/hci.h
+++ b/trunk/include/net/nfc/hci.h
@@ -84,8 +84,6 @@ struct nfc_hci_dev {
 
 	u8 gate2pipe[NFC_HCI_MAX_GATES];
 
-	bool poll_started;
-
 	u8 sw_romlib;
 	u8 sw_patch;
 	u8 sw_flashlib_major;
diff --git a/trunk/net/nfc/hci/core.c b/trunk/net/nfc/hci/core.c
index 0fdb96f152b1..e1a640d2b588 100644
--- a/trunk/net/nfc/hci/core.c
+++ b/trunk/net/nfc/hci/core.c
@@ -251,11 +251,6 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
 
 	switch (event) {
 	case NFC_HCI_EVT_TARGET_DISCOVERED:
-		if (hdev->poll_started == false) {
-			r = -EPROTO;
-			goto exit;
-		}
-
 		if (skb->len < 1) {	/* no status data? */
 			r = -EPROTO;
 			goto exit;
@@ -489,28 +484,20 @@ static int hci_dev_down(struct nfc_dev *nfc_dev)
 static int hci_start_poll(struct nfc_dev *nfc_dev, u32 protocols)
 {
 	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
-	int r;
 
 	if (hdev->ops->start_poll)
-		r = hdev->ops->start_poll(hdev, protocols);
+		return hdev->ops->start_poll(hdev, protocols);
 	else
-		r = nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
+		return nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
 				       NFC_HCI_EVT_READER_REQUESTED, NULL, 0);
-	if (r == 0)
-		hdev->poll_started = true;
-
-	return r;
 }
 
 static void hci_stop_poll(struct nfc_dev *nfc_dev)
 {
 	struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
 
-	if (hdev->poll_started) {
-		nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
-				   NFC_HCI_EVT_END_OPERATION, NULL, 0);
-		hdev->poll_started = false;
-	}
+	nfc_hci_send_event(hdev, NFC_HCI_RF_READER_A_GATE,
+			   NFC_HCI_EVT_END_OPERATION, NULL, 0);
 }
 
 static int hci_activate_target(struct nfc_dev *nfc_dev,