From 1422aa86882f5435697bd1fb8a4e05436285a6ad Mon Sep 17 00:00:00 2001
From: Eric Lapuyade <eric.lapuyade@intel.com>
Date: Thu, 3 May 2012 16:21:58 +0200
Subject: [PATCH] --- yaml --- r: 315286 b: refs/heads/master c:
 8668fdd6efb3a75e0d58a3287a47fa7e60a68a73 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/nfc/core.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index eb4759f87c59..f8004b184a52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a070c8591a503ec65e2c84ebaf3454e5cd76e3fe
+refs/heads/master: 8668fdd6efb3a75e0d58a3287a47fa7e60a68a73
diff --git a/trunk/net/nfc/core.c b/trunk/net/nfc/core.c
index 32f28326b623..94ccf07374a5 100644
--- a/trunk/net/nfc/core.c
+++ b/trunk/net/nfc/core.c
@@ -571,13 +571,18 @@ int nfc_targets_found(struct nfc_dev *dev,
 
 	pr_debug("dev_name=%s n_targets=%d\n", dev_name(&dev->dev), n_targets);
 
-	dev->polling = false;
-
 	for (i = 0; i < n_targets; i++)
 		targets[i].idx = dev->target_next_idx++;
 
 	device_lock(&dev->dev);
 
+	if (dev->polling == false) {
+		device_unlock(&dev->dev);
+		return 0;
+	}
+
+	dev->polling = false;
+
 	dev->targets_generation++;
 
 	kfree(dev->targets);