diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /net/wireless | |
| parent | 42099d7a3941d4aaf853caac92b3ae76149fc6e7 (diff) | |
| parent | 2cc6d2bf3d6195fabcf0febc192c01f99519a8f3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'net/wireless')
| -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, | |||
| 152 | } else if (!iwp->pointer) | 152 | } else if (!iwp->pointer) |
| 153 | return -EFAULT; | 153 | return -EFAULT; |
| 154 | 154 | ||
| 155 | extra = kmalloc(extra_size, GFP_KERNEL); | 155 | extra = kzalloc(extra_size, GFP_KERNEL); |
| 156 | if (!extra) | 156 | if (!extra) |
| 157 | return -ENOMEM; | 157 | return -ENOMEM; |
| 158 | 158 | ||