From 5015e094aaa846d4ba8ba5e1fe431c2cb30116ac Mon Sep 17 00:00:00 2001
From: Chen Gang <gang.chen@asianux.com>
Date: Thu, 16 May 2013 23:13:04 +0000
Subject: [PATCH] --- yaml --- r: 376114 b: refs/heads/master c:
 ff0102ee104847023c36357e2b9f133f3f40d211 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/irda/irlap_frame.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a196074da095..a513ad8282e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b21e1b77d1a3d58ebfd513264c885695e8a0ba5
+refs/heads/master: ff0102ee104847023c36357e2b9f133f3f40d211
diff --git a/trunk/net/irda/irlap_frame.c b/trunk/net/irda/irlap_frame.c
index 8c004161a843..9ea0c933b9ff 100644
--- a/trunk/net/irda/irlap_frame.c
+++ b/trunk/net/irda/irlap_frame.c
@@ -544,7 +544,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self,
 		/*
 		 *  We now have some discovery info to deliver!
 		 */
-		discovery = kmalloc(sizeof(discovery_t), GFP_ATOMIC);
+		discovery = kzalloc(sizeof(discovery_t), GFP_ATOMIC);
 		if (!discovery) {
 			IRDA_WARNING("%s: unable to malloc!\n", __func__);
 			return;