diff options
author | Takis <panagiotis.issaris@gmail.com> | 2005-12-01 04:41:45 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 04:51:34 -0500 |
commit | c75f4742e2306a319baaa556e53209d4e7c47f0d (patch) | |
tree | 6644c1c802b8a4f9efb02eca774d9ec24c5fa845 /drivers/net/wireless/ipw2200.c | |
parent | 62d65a8062530a4b2673999deb9be368fa60ca87 (diff) |
[PATCH] ipw2200: kzalloc conversion and Kconfig dependency fix
- 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>
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 5e7c7e944c9d..0e47b23605f9 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -4944,12 +4944,11 @@ static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *priv) | |||
4944 | struct ipw_rx_queue *rxq; | 4944 | struct ipw_rx_queue *rxq; |
4945 | int i; | 4945 | int i; |
4946 | 4946 | ||
4947 | rxq = (struct ipw_rx_queue *)kmalloc(sizeof(*rxq), GFP_KERNEL); | 4947 | rxq = kzalloc(sizeof(*rxq), GFP_KERNEL); |
4948 | if (unlikely(!rxq)) { | 4948 | if (unlikely(!rxq)) { |
4949 | IPW_ERROR("memory allocation failed\n"); | 4949 | IPW_ERROR("memory allocation failed\n"); |
4950 | return NULL; | 4950 | return NULL; |
4951 | } | 4951 | } |
4952 | memset(rxq, 0, sizeof(*rxq)); | ||
4953 | spin_lock_init(&rxq->lock); | 4952 | spin_lock_init(&rxq->lock); |
4954 | INIT_LIST_HEAD(&rxq->rx_free); | 4953 | INIT_LIST_HEAD(&rxq->rx_free); |
4955 | INIT_LIST_HEAD(&rxq->rx_used); | 4954 | INIT_LIST_HEAD(&rxq->rx_used); |