From 2bbf9cf9bf183384c2bdc44bc149b8f3e8d6ad07 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 26 Jan 2012 09:13:31 +0300
Subject: [PATCH] --- yaml --- r: 289997 b: refs/heads/master c:
 6269cc83e7c444f3050e0d7e640d079bae17aa68 h: refs/heads/master i:   289995:
 818b5a5df66658d3fcd938b6bf0bbe501c93dc9b v: v3

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

diff --git a/[refs] b/[refs]
index b9108ef0a17a..169952fb5250 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4f3b9725ed476adbcaf1c49d882ab541bc4214c
+refs/heads/master: 6269cc83e7c444f3050e0d7e640d079bae17aa68
diff --git a/trunk/net/nfc/nci/core.c b/trunk/net/nfc/nci/core.c
index 12d1d4d62672..a47e90c7d9d1 100644
--- a/trunk/net/nfc/nci/core.c
+++ b/trunk/net/nfc/nci/core.c
@@ -444,7 +444,7 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, __u32 target_idx,
 {
 	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
 	struct nci_rf_discover_select_param param;
-	struct nfc_target *target = 0;
+	struct nfc_target *target = NULL;
 	int i;
 	int rc = 0;