From 13f72c559bc7b19799d3b3297e3926433ca5d0cc Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 13 May 2010 10:03:32 +0000
Subject: [PATCH] --- yaml --- r: 195276 b: refs/heads/master c:
 49afa55b5bd792cda4fca15d3238e9b6f370c856 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/caif/cfcnfg.c | 3 +--
 trunk/net/caif/cfctrl.c | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1602a3154327..6dd9a449f70e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: beae22e6f393c461ee7fb394dbf06fa50157836b
+refs/heads/master: 49afa55b5bd792cda4fca15d3238e9b6f370c856
diff --git a/trunk/net/caif/cfcnfg.c b/trunk/net/caif/cfcnfg.c
index 471c62939fad..df43f264d9fb 100644
--- a/trunk/net/caif/cfcnfg.c
+++ b/trunk/net/caif/cfcnfg.c
@@ -65,12 +65,11 @@ struct cfcnfg *cfcnfg_create(void)
 	struct cfcnfg *this;
 	struct cfctrl_rsp *resp;
 	/* Initiate this layer */
-	this = kmalloc(sizeof(struct cfcnfg), GFP_ATOMIC);
+	this = kzalloc(sizeof(struct cfcnfg), GFP_ATOMIC);
 	if (!this) {
 		pr_warning("CAIF: %s(): Out of memory\n", __func__);
 		return NULL;
 	}
-	memset(this, 0, sizeof(struct cfcnfg));
 	this->mux = cfmuxl_create();
 	if (!this->mux)
 		goto out_of_mem;
diff --git a/trunk/net/caif/cfctrl.c b/trunk/net/caif/cfctrl.c
index a521d32cfe56..0ffe1e1ce901 100644
--- a/trunk/net/caif/cfctrl.c
+++ b/trunk/net/caif/cfctrl.c
@@ -284,12 +284,11 @@ int cfctrl_linkup_request(struct cflayer *layer,
 			   __func__, param->linktype);
 		return -EINVAL;
 	}
-	req = kmalloc(sizeof(*req), GFP_KERNEL);
+	req = kzalloc(sizeof(*req), GFP_KERNEL);
 	if (!req) {
 		pr_warning("CAIF: %s(): Out of memory\n", __func__);
 		return -ENOMEM;
 	}
-	memset(req, 0, sizeof(*req));
 	req->client_layer = user_layer;
 	req->cmd = CFCTRL_CMD_LINK_SETUP;
 	req->param = *param;