From 9681249d1b3c9acd1cd17cf59e596d9e5a9d4193 Mon Sep 17 00:00:00 2001
From: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Date: Mon, 26 Nov 2012 14:18:37 +0100
Subject: [PATCH] --- yaml --- r: 351880 b: refs/heads/master c:
 d22b2db69035ae3b8f71a58dfe0bd10ae1ee58d5 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/nfc/pn533.c | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index bec6548b31a6..2b4ba34b343f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94c5c1561dde894766b1a9135e47b056fdbe13a4
+refs/heads/master: d22b2db69035ae3b8f71a58dfe0bd10ae1ee58d5
diff --git a/trunk/drivers/nfc/pn533.c b/trunk/drivers/nfc/pn533.c
index 94c88bb601cd..c34acd0dc5ff 100644
--- a/trunk/drivers/nfc/pn533.c
+++ b/trunk/drivers/nfc/pn533.c
@@ -1062,6 +1062,20 @@ static void pn533_send_complete(struct urb *urb)
 	}
 }
 
+static struct sk_buff *pn533_alloc_skb(unsigned int size)
+{
+	struct sk_buff *skb;
+
+	skb = alloc_skb(PN533_FRAME_HEADER_LEN +
+			size +
+			PN533_FRAME_TAIL_LEN, GFP_KERNEL);
+
+	if (skb)
+		skb_reserve(skb, PN533_FRAME_HEADER_LEN);
+
+	return skb;
+}
+
 struct pn533_target_type_a {
 	__be16 sens_res;
 	u8 sel_res;
@@ -2390,15 +2404,11 @@ static void pn533_wq_mi_recv(struct work_struct *work)
 	nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
 	/* This is a zero payload size skb */
-	skb_cmd = alloc_skb(PN533_FRAME_HEADER_LEN +
-			    PN533_CMD_DATAEXCH_HEAD_LEN +
-			    PN533_FRAME_TAIL_LEN,
-			    GFP_KERNEL);
+	skb_cmd = pn533_alloc_skb(PN533_CMD_DATAEXCH_HEAD_LEN);
 	if (skb_cmd == NULL)
 		goto error_cmd;
 
-	skb_reserve(skb_cmd,
-		    PN533_FRAME_HEADER_LEN + PN533_CMD_DATAEXCH_HEAD_LEN);
+	skb_reserve(skb_cmd, PN533_CMD_DATAEXCH_HEAD_LEN);
 
 	rc = pn533_build_tx_frame(dev, skb_cmd, true);
 	if (rc)