From 93bcebfc8c25997b1f90a80ee98222535531312a Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 17 May 2010 02:37:33 -0700 Subject: [PATCH] --- yaml --- r: 202875 b: refs/heads/master c: 519c7c416870c6e71e9553786a529d89f55ef395 h: refs/heads/master i: 202873: 6b3ac10081f54b6a3138ad9e65f759538a40c3b3 202871: 49803c53a5a8c605eaa5055f35bdeafb7d1524a7 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23e113438934..f9b09aa4f2f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f80240e0a738a6c5cef005291a90522959f3ba2 +refs/heads/master: 519c7c416870c6e71e9553786a529d89f55ef395 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c index 769136f8f321..a81989c06983 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -272,7 +272,7 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv, /* Driver private data, only for Tx (not command) queues, * not shared with device. */ if (id != IWL_CMD_QUEUE_NUM) { - txq->txb = kmalloc(sizeof(txq->txb[0]) * + txq->txb = kzalloc(sizeof(txq->txb[0]) * TFD_QUEUE_SIZE_MAX, GFP_KERNEL); if (!txq->txb) { IWL_ERR(priv, "kmalloc for auxiliary BD "