Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c75f4742 authored by Takis's avatar Takis Committed by Jeff Garzik
Browse files

[PATCH] ipw2200: kzalloc conversion and Kconfig dependency fix 



- Use kzalloc for IPW2200
- Fix config dependency for IPW2200

Signed-off-by: default avatarPanagiotis 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 62d65a80

drivers/net/wireless/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/ipw2200.c

+1 −2
Original line number Diff line number Diff line
@@ -4944,12 +4944,11 @@ static struct ipw_rx_queue *ipw_rx_queue_alloc(struct ipw_priv *priv) 
	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);