diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 09:38:13 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 09:38:13 +0200 |
| commit | b71426eb10d904d421b36f51f93c8d0ba558edac (patch) | |
| tree | a8c7088a6b89499134e01750652aa55f2baa890f /net/ieee80211/ieee80211_crypt.c | |
| parent | [libata] sata_promise: comment out duplicate PCI ID (diff) | |
| parent | [PATCH] Cpuset: fix ABBA deadlock with cpu hotplug lock (diff) | |
| download | linux-b71426eb10d904d421b36f51f93c8d0ba558edac.tar.xz linux-b71426eb10d904d421b36f51f93c8d0ba558edac.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'net/ieee80211/ieee80211_crypt.c')
| -rw-r--r-- | net/ieee80211/ieee80211_crypt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c index cb71d794a7d1..5ed0a98b2d76 100644 --- a/net/ieee80211/ieee80211_crypt.c +++ b/net/ieee80211/ieee80211_crypt.c @@ -110,11 +110,10 @@ int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops) unsigned long flags; struct ieee80211_crypto_alg *alg; - 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(&ieee80211_crypto_lock, flags); |