aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/hostap/hostap_info.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-07 05:02:40 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-07 05:02:40 -0500
commit359f2d17e32b32f53577375f83fb06d34e31bfe8 (patch)
tree2890ffcf40fab2d2c24d2d208814afeb52bb12e5 /drivers/net/wireless/hostap/hostap_info.c
parent0efdf2626676db4b30d343ff88f8461ad09130da (diff)
parent720eeb4332e5871c97d390b2fb55a5a74fb18ae6 (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Conflicts: drivers/net/wireless/zd1211rw/zd_mac.h net/ieee80211/softmac/ieee80211softmac_assoc.c
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_info.c')
-rw-r--r--drivers/net/wireless/hostap/hostap_info.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c
index 5fd2b1ad7f5..b6a02a02da7 100644
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -327,11 +327,10 @@ static void prism2_info_hostscanresults(local_info_t *local,
ptr = (u8 *) pos;
new_count = left / result_size;
- results = kmalloc(new_count * sizeof(struct hfa384x_hostscan_result),
+ results = kcalloc(new_count, sizeof(struct hfa384x_hostscan_result),
GFP_ATOMIC);
if (results == NULL)
return;
- memset(results, 0, new_count * sizeof(struct hfa384x_hostscan_result));
for (i = 0; i < new_count; i++) {
memcpy(&results[i], ptr, copy_len);