diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-21 23:26:07 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-21 23:26:07 +0400 |
| commit | 2d813760d75150db437e40d340ae0e06ddd54a34 (patch) | |
| tree | b52e8df51dec523f833d5145589b86ac1703b96e /net | |
| parent | a4d258036ed9b2a1811c3670c6099203a0f284a0 (diff) | |
| parent | df6d02300f7c2fbd0fbe626d819c8e5237d72c62 (diff) | |
| download | linux-2d813760d75150db437e40d340ae0e06ddd54a34.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/wext-priv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/wext-priv.c b/net/wireless/wext-priv.c index 3feb28e41c53..674d426a9d24 100644 --- a/net/wireless/wext-priv.c +++ b/net/wireless/wext-priv.c @@ -152,7 +152,7 @@ static int ioctl_private_iw_point(struct iw_point *iwp, unsigned int cmd, } else if (!iwp->pointer) return -EFAULT; - extra = kmalloc(extra_size, GFP_KERNEL); + extra = kzalloc(extra_size, GFP_KERNEL); if (!extra) return -ENOMEM; |