---

yaml --- r: 315286 b: refs/heads/master c: 8668fdd h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · 1422aa8 · 1422aa8
1 parent 56bdb96
commit 1422aa8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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);