Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 278602
b: refs/heads/master
c: 2b50b8f
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Meyer authored and John W. Linville committed Dec 6, 2011
1 parent d886f29 commit c0a468c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 839fafbe0dc35fabeb9bd3be9727fd74d12c0b9d
refs/heads/master: 2b50b8f58803f4c8521c6aa5401ed01cd36a1f77
5 changes: 2 additions & 3 deletions trunk/drivers/net/wireless/iwlegacy/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -2786,9 +2786,8 @@ il_tx_queue_alloc(struct il_priv *il, struct il_tx_queue *txq, u32 id)
/* Driver ilate data, only for Tx (not command) queues,
* not shared with device. */
if (id != il->cmd_queue) {
txq->txb =
kzalloc(sizeof(txq->txb[0]) * TFD_QUEUE_SIZE_MAX,
GFP_KERNEL);
txq->txb = kcalloc(TFD_QUEUE_SIZE_MAX, sizeof(txq->txb[0]),
GFP_KERNEL);
if (!txq->txb) {
IL_ERR("kmalloc for auxiliary BD "
"structures failed\n");
Expand Down

0 comments on commit c0a468c

Please sign in to comment.