From dd0d2e2c0543d653adf4392b5bb5bd5d3ed5287b Mon Sep 17 00:00:00 2001
From: Eric Lapuyade <eric.lapuyade@linux.intel.com>
Date: Tue, 4 Dec 2012 16:44:25 +0100
Subject: [PATCH] --- yaml --- r: 351906 b: refs/heads/master c:
 924d4a023ee6da2e40c78578829e68bcbabee2dd h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/nfc/pn544/pn544.c | 10 ++++++++--
 trunk/net/nfc/hci/core.c        |  6 ++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4d3293c88aa5..89c8e7023a57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40d06d3647ea872a7346be1f6859f18cd0fe08d3
+refs/heads/master: 924d4a023ee6da2e40c78578829e68bcbabee2dd
diff --git a/trunk/drivers/nfc/pn544/pn544.c b/trunk/drivers/nfc/pn544/pn544.c
index 9349c548e8dc..cd8fb16f5416 100644
--- a/trunk/drivers/nfc/pn544/pn544.c
+++ b/trunk/drivers/nfc/pn544/pn544.c
@@ -675,11 +675,17 @@ static int pn544_hci_im_transceive(struct nfc_hci_dev *hdev,
 
 static int pn544_hci_tm_send(struct nfc_hci_dev *hdev, struct sk_buff *skb)
 {
+	int r;
+
 	/* Set default false for multiple information chaining */
 	*skb_push(skb, 1) = 0;
 
-	return nfc_hci_send_event(hdev, PN544_RF_READER_NFCIP1_TARGET_GATE,
-				PN544_HCI_EVT_SND_DATA, skb->data, skb->len);
+	r = nfc_hci_send_event(hdev, PN544_RF_READER_NFCIP1_TARGET_GATE,
+			       PN544_HCI_EVT_SND_DATA, skb->data, skb->len);
+
+	kfree_skb(skb);
+
+	return r;
 }
 
 static int pn544_hci_check_presence(struct nfc_hci_dev *hdev,
diff --git a/trunk/net/nfc/hci/core.c b/trunk/net/nfc/hci/core.c
index 0430f3086e41..d9190da4a403 100644
--- a/trunk/net/nfc/hci/core.c
+++ b/trunk/net/nfc/hci/core.c
@@ -675,8 +675,10 @@ static int hci_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
 
 	if (hdev->ops->tm_send)
 		return hdev->ops->tm_send(hdev, skb);
-	else
-		return -ENOTSUPP;
+
+	kfree_skb(skb);
+
+	return -ENOTSUPP;
 }
 
 static int hci_check_presence(struct nfc_dev *nfc_dev,