From b33ffe5076aff43216245628db4fbf52cda4d81f Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Thu, 10 Nov 2011 19:04:19 +0100
Subject: [PATCH] --- yaml --- r: 281053 b: refs/heads/master c:
 929fa2a42e75e0c6ded89c450bd0f668e32190d7 h: refs/heads/master i:   281051:
 bdf862483fb496a7a9def582d1ccb7551f8f27b0 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/rtl8192e/rtllib_crypt.c      | 6 ++----
 trunk/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 3 +--
 trunk/drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 3 +--
 trunk/drivers/staging/rtl8192e/rtllib_crypt_wep.c  | 3 +--
 trunk/drivers/staging/rtl8192e/rtllib_softmac.c    | 3 +--
 trunk/drivers/staging/rtl8192e/rtllib_wx.c         | 3 +--
 7 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 883ecef343aa..b9235c578ffc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61fcc0166f8f004b36ac2ec239e43cfda7a62278
+refs/heads/master: 929fa2a42e75e0c6ded89c450bd0f668e32190d7
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_crypt.c b/trunk/drivers/staging/rtl8192e/rtllib_crypt.c
index acda37b81848..a33bf024c37e 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_crypt.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_crypt.c
@@ -104,11 +104,10 @@ int rtllib_register_crypto_ops(struct rtllib_crypto_ops *ops)
 	if (hcrypt == NULL)
 		return -1;
 
-	alg = kmalloc(sizeof(*alg), GFP_KERNEL);
+	alg = kzalloc(sizeof(*alg), GFP_KERNEL);
 	if (alg == NULL)
 		return -ENOMEM;
 
-	memset(alg, 0, sizeof(*alg));
 	alg->ops = ops;
 
 	spin_lock_irqsave(&hcrypt->lock, flags);
@@ -202,11 +201,10 @@ int __init rtllib_crypto_init(void)
 {
 	int ret = -ENOMEM;
 
-	hcrypt = kmalloc(sizeof(*hcrypt), GFP_KERNEL);
+	hcrypt = kzalloc(sizeof(*hcrypt), GFP_KERNEL);
 	if (!hcrypt)
 		goto out;
 
-	memset(hcrypt, 0, sizeof(*hcrypt));
 	INIT_LIST_HEAD(&hcrypt->algs);
 	spin_lock_init(&hcrypt->lock);
 
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/trunk/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
index 6196b9aa3a09..63b75045aa6b 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
@@ -63,10 +63,9 @@ static void *rtllib_ccmp_init(int key_idx)
 {
 	struct rtllib_ccmp_data *priv;
 
-	priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
 	if (priv == NULL)
 		goto fail;
-	memset(priv, 0, sizeof(*priv));
 	priv->key_idx = key_idx;
 
 	priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_crypt_tkip.c b/trunk/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
index 6a0c87886422..70d5001e6460 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
@@ -60,10 +60,9 @@ static void *rtllib_tkip_init(int key_idx)
 {
 	struct rtllib_tkip_data *priv;
 
-	priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
 	if (priv == NULL)
 		goto fail;
-	memset(priv, 0, sizeof(*priv));
 	priv->key_idx = key_idx;
 	priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
 			CRYPTO_ALG_ASYNC);
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_crypt_wep.c b/trunk/drivers/staging/rtl8192e/rtllib_crypt_wep.c
index c59bf10fe780..1f1ffb8ea197 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_crypt_wep.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_crypt_wep.c
@@ -38,10 +38,9 @@ static void *prism2_wep_init(int keyidx)
 {
 	struct prism2_wep_data *priv;
 
-	priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
 	if (priv == NULL)
 		goto fail;
-	memset(priv, 0, sizeof(*priv));
 	priv->key_idx = keyidx;
 
 	priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
index fa774cf7fc78..30c3bca1c368 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -3048,10 +3048,9 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
 	ieee->state = RTLLIB_NOLINK;
 	for (i = 0; i < 5; i++)
 		ieee->seq_ctrl[i] = 0;
-	ieee->pDot11dInfo = kmalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC);
+	ieee->pDot11dInfo = kzalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC);
 	if (!ieee->pDot11dInfo)
 		RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't alloc memory for DOT11D\n");
-	memset(ieee->pDot11dInfo, 0, sizeof(struct rt_dot11d_info));
 	ieee->LinkDetectInfo.SlotIndex = 0;
 	ieee->LinkDetectInfo.SlotNum = 2;
 	ieee->LinkDetectInfo.NumRecvBcnInPeriod = 0;
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_wx.c b/trunk/drivers/staging/rtl8192e/rtllib_wx.c
index 8cea4a60e1b3..a8fd2e1f4ada 100644
--- a/trunk/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/trunk/drivers/staging/rtl8192e/rtllib_wx.c
@@ -368,11 +368,10 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
 		struct rtllib_crypt_data *new_crypt;
 
 		/* take WEP into use */
-		new_crypt = kmalloc(sizeof(struct rtllib_crypt_data),
+		new_crypt = kzalloc(sizeof(struct rtllib_crypt_data),
 				    GFP_KERNEL);
 		if (new_crypt == NULL)
 			return -ENOMEM;
-		memset(new_crypt, 0, sizeof(struct rtllib_crypt_data));
 		new_crypt->ops = rtllib_get_crypto_ops("WEP");
 		if (!new_crypt->ops) {
 			request_module("rtllib_crypt_wep");