aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy
diff options
context:
space:
mode:
authorThomas Meyer <thomas@m3y3r.de>2011-11-29 16:08:00 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-06 16:05:24 -0500
commit2b50b8f58803f4c8521c6aa5401ed01cd36a1f77 (patch)
tree18779196958f2444a7a94a998265f4e21a477d81 /drivers/net/wireless/iwlegacy
parent839fafbe0dc35fabeb9bd3be9727fd74d12c0b9d (diff)
iwlegacy: Use kcalloc instead of kzalloc to allocate array
The advantage of kcalloc is, that will prevent integer overflows which could result from the multiplication of number of elements and size and it is also a bit nicer to read. The semantic patch that makes this change is available in https://lkml.org/lkml/2011/11/25/107 Signed-off-by: Thomas Meyer <thomas@m3y3r.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
-rw-r--r--drivers/net/wireless/iwlegacy/common.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 7e2924f332a7..881ba043770a 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -2786,9 +2786,8 @@ il_tx_queue_alloc(struct il_priv *il, struct il_tx_queue *txq, u32 id)
2786 /* Driver ilate data, only for Tx (not command) queues, 2786 /* Driver ilate data, only for Tx (not command) queues,
2787 * not shared with device. */ 2787 * not shared with device. */
2788 if (id != il->cmd_queue) { 2788 if (id != il->cmd_queue) {
2789 txq->txb = 2789 txq->txb = kcalloc(TFD_QUEUE_SIZE_MAX, sizeof(txq->txb[0]),
2790 kzalloc(sizeof(txq->txb[0]) * TFD_QUEUE_SIZE_MAX, 2790 GFP_KERNEL);
2791 GFP_KERNEL);
2792 if (!txq->txb) { 2791 if (!txq->txb) {
2793 IL_ERR("kmalloc for auxiliary BD " 2792 IL_ERR("kmalloc for auxiliary BD "
2794 "structures failed\n"); 2793 "structures failed\n");