diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:15:41 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:15:41 -0500 |
commit | 9b7c84899ea6bfc4f8932a83b28db313e7397bd1 (patch) | |
tree | 76af15f52485f95cf7c841e9994f6a9f99eab4b4 /drivers/net/wireless/hostap/hostap_cs.c | |
parent | eff4b1fe0aa8002cbf414576e8cc102967bd9d5d (diff) | |
parent | 4edac92fcf5956b0ef52fb281207863902e430bc (diff) |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_cs.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index f8f4503475f9..d335b250923a 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c @@ -585,8 +585,6 @@ static int prism2_config(dev_link_t *link) parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL); hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL); if (parse == NULL || hw_priv == NULL) { - kfree(parse); - kfree(hw_priv); ret = -ENOMEM; goto failed; } |