GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 08:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream

Browse source 
Conflicts:

	drivers/net/wireless/zd1211rw/zd_mac.h
	net/ieee80211/softmac/ieee80211softmac_assoc.c
This commit is contained in:
Jeff Garzik 2006-12-07 05:02:40 -05:00
commit 359f2d17e3
21 changed files with 158 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/wireless/hostap/hostap_cs.c
View file

@ -563,12 +563,11 @@ static int prism2_config(struct pcmcia_device *link)
PDEBUG(DEBUG_FLOW, "prism2_config()\n");
parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
hw_priv = kzalloc(sizeof(*hw_priv), GFP_KERNEL);
if (parse == NULL || hw_priv == NULL) {
ret = -ENOMEM;
goto failed;
}
memset(hw_priv, 0, sizeof(*hw_priv));
tuple.Attributes = 0;
tuple.TupleData = buf;