diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-18 00:09:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-18 00:09:11 -0400 |
| commit | 820ae8a80eb59962aefbbd4908dfe144ec0f9edb (patch) | |
| tree | 6c0f7356afff14e1c7d266de644810cd2de7caa9 /drivers/net/wireless/hostap/hostap_ioctl.c | |
| parent | 380fefb2ddabd4cd5f14dbe090481f0544e65078 (diff) | |
| parent | 6fe70aae0d128339febfabc073ba4c4a03de4f45 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ioctl.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index 9a082308a9d4..a85e43a8d758 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c | |||
| @@ -3039,8 +3039,7 @@ static int prism2_ioctl_priv_download(local_info_t *local, struct iw_point *p) | |||
| 3039 | p->length > 1024 || !p->pointer) | 3039 | p->length > 1024 || !p->pointer) |
| 3040 | return -EINVAL; | 3040 | return -EINVAL; |
| 3041 | 3041 | ||
| 3042 | param = (struct prism2_download_param *) | 3042 | param = kmalloc(p->length, GFP_KERNEL); |
| 3043 | kmalloc(p->length, GFP_KERNEL); | ||
| 3044 | if (param == NULL) | 3043 | if (param == NULL) |
| 3045 | return -ENOMEM; | 3044 | return -ENOMEM; |
| 3046 | 3045 | ||