From 2251b1f904d67af1b9e7b5b7cf8d85b01f5bcfbe Mon Sep 17 00:00:00 2001
From: Eric Lapuyade <eric.lapuyade@intel.com>
Date: Thu, 3 May 2012 16:33:32 +0200
Subject: [PATCH] --- yaml --- r: 315287 b: refs/heads/master c:
 d94f9c55ff22397cc3436840437da533e9263716 h: refs/heads/master i:   315285:
 56bdb961a415df8fdcf7ca61e059ea6710213c01   315283:
 5ad17e9415d87a0d92c6ba8c855160aec377e41a   315279:
 236ffd0d33ff15203407924ec996995282dd08e8 v: v3

---
 [refs]               |  2 +-
 trunk/net/nfc/core.c | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f8004b184a52..3af5d9b823d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8668fdd6efb3a75e0d58a3287a47fa7e60a68a73
+refs/heads/master: d94f9c55ff22397cc3436840437da533e9263716
diff --git a/trunk/net/nfc/core.c b/trunk/net/nfc/core.c
index 94ccf07374a5..749ee48d3600 100644
--- a/trunk/net/nfc/core.c
+++ b/trunk/net/nfc/core.c
@@ -560,6 +560,8 @@ EXPORT_SYMBOL(nfc_alloc_recv_skb);
  * The device driver must call this function when one or many nfc targets
  * are found. After calling this function, the device driver must stop
  * polling for targets.
+ * NOTE: This function can be called with targets=NULL and n_targets=0 to
+ * notify a driver error, meaning that the polling operation cannot complete.
  * IMPORTANT: this function must not be called from an atomic context.
  * In addition, it must also not be called from a context that would prevent
  * the NFC Core to call other nfc ops entry point concurrently.
@@ -586,13 +588,18 @@ int nfc_targets_found(struct nfc_dev *dev,
 	dev->targets_generation++;
 
 	kfree(dev->targets);
-	dev->targets = kmemdup(targets, n_targets * sizeof(struct nfc_target),
-			       GFP_ATOMIC);
+	dev->targets = NULL;
 
-	if (!dev->targets) {
-		dev->n_targets = 0;
-		device_unlock(&dev->dev);
-		return -ENOMEM;
+	if (targets) {
+		dev->targets = kmemdup(targets,
+				       n_targets * sizeof(struct nfc_target),
+				       GFP_ATOMIC);
+
+		if (!dev->targets) {
+			dev->n_targets = 0;
+			device_unlock(&dev->dev);
+			return -ENOMEM;
+		}
 	}
 
 	dev->n_targets = n_targets;