iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] ipw2200: kzalloc conversion and Kconfig dependency fix

Browse Source 
- Use kzalloc for IPW2200
- Fix config dependency for IPW2200

Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Cc: James Ketrenos <jketreno@linux.intel.com>
Cc: Yi Zhu <yi.zhu@intel.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Takis 2005-12-01 01:41:45 -08:00 committed by Jeff Garzik
parent 62d65a8062
commit c75f4742e2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/Kconfig
View File

@ -192,7 +192,7 @@ config IPW_DEBUG
config IPW2200 config IPW2200
tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
depends on IEEE80211 && PCI depends on NET_RADIO && IEEE80211 && PCI
select FW_LOADER select FW_LOADER
---help--- ---help---
A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network

3
drivers/net/wireless/ipw2200.c
View File

@ -4944,12 +4944,11 @@ static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *priv)
struct ipw_rx_queue *rxq; struct ipw_rx_queue *rxq;
int i; int i;
rxq = (struct ipw_rx_queue *)kmalloc(sizeof(*rxq), GFP_KERNEL); rxq = kzalloc(sizeof(*rxq), GFP_KERNEL);
if (unlikely(!rxq)) { if (unlikely(!rxq)) {
IPW_ERROR("memory allocation failed\n"); IPW_ERROR("memory allocation failed\n");
return NULL; return NULL;
} }
memset(rxq, 0, sizeof(*rxq));
spin_lock_init(&rxq->lock); spin_lock_init(&rxq->lock);
INIT_LIST_HEAD(&rxq->rx_free); INIT_LIST_HEAD(&rxq->rx_free);
INIT_LIST_HEAD(&rxq->rx_used); INIT_LIST_HEAD(&rxq->rx_used);