Merge branch 'for-linus' of git://neil.brown.name/md

[sfrench/cifs-2.6.git] / drivers / staging / rtl8192e / ieee80211 / ieee80211_crypt.c

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c
index b3c9bf4b4ea6ed6a3095ef42bc1c3e47ca28492d..d5aa9af3d9f4db2c499666bceade07ef3e381cd0 100644 (file)
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c
@@ -109,11 +109,10 @@ int ieee80211_register_crypto_ops(struct ieee80211_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);
@@ -207,11 +206,10 @@ int __init ieee80211_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);