From: Takis - Use kzalloc for IPW2200 - Fix config dependency for IPW2200 Signed-off-by: Panagiotis Issaris Cc: James Ketrenos Cc: Yi Zhu Cc: Jeff Garzik Signed-off-by: Andrew Morton --- drivers/net/wireless/Kconfig | 2 +- drivers/net/wireless/ipw2200.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/net/wireless/ipw2200.c~ipw2200-kzalloc-conversion-and-kconfig-dependency-fix drivers/net/wireless/ipw2200.c --- 25/drivers/net/wireless/ipw2200.c~ipw2200-kzalloc-conversion-and-kconfig-dependency-fix Wed Nov 9 15:49:35 2005 +++ 25-akpm/drivers/net/wireless/ipw2200.c Wed Nov 9 15:49:35 2005 @@ -4945,12 +4945,11 @@ static struct ipw_rx_queue *ipw_rx_queue struct ipw_rx_queue *rxq; int i; - rxq = (struct ipw_rx_queue *)kmalloc(sizeof(*rxq), GFP_KERNEL); + rxq = kzalloc(sizeof(*rxq), GFP_KERNEL); if (unlikely(!rxq)) { IPW_ERROR("memory allocation failed\n"); return NULL; } - memset(rxq, 0, sizeof(*rxq)); spin_lock_init(&rxq->lock); INIT_LIST_HEAD(&rxq->rx_free); INIT_LIST_HEAD(&rxq->rx_used); diff -puN drivers/net/wireless/Kconfig~ipw2200-kzalloc-conversion-and-kconfig-dependency-fix drivers/net/wireless/Kconfig --- 25/drivers/net/wireless/Kconfig~ipw2200-kzalloc-conversion-and-kconfig-dependency-fix Wed Nov 9 15:49:35 2005 +++ 25-akpm/drivers/net/wireless/Kconfig Wed Nov 9 15:49:35 2005 @@ -192,7 +192,7 @@ config IPW_DEBUG config IPW2200 tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" - depends on IEEE80211 && PCI + depends on NET_RADIO && IEEE80211 && PCI select FW_LOADER ---help--- A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network _