From af783961a7c1d348e9ccbb8f9f4313d9d23199bb Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Thu, 10 Nov 2011 06:55:20 -0800 Subject: [PATCH] --- yaml --- r: 277863 b: refs/heads/master c: 9cac4943aa15763a2b1f13d276ae03b4cd5aa9a1 h: refs/heads/master i: 277861: 0b5cba5f602aae37594f9f62e4319c655fa08d03 277859: 31eee5bd709c4782f326c85c2757b209b4f664f7 277855: 192d7d9362423059252dc15db4bb8b89e02eb37e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5cd74c821280..0d3dee3dd271 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94b3c45c7be7a392764e5945d4ebb095a42e5ef0 +refs/heads/master: 9cac4943aa15763a2b1f13d276ae03b4cd5aa9a1 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index 09a31dc1476f..a6d898b52b9f 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c @@ -1075,7 +1075,7 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd) trans_pcie->txq[trans->shrd->cmd_queue].meta[cmd_idx].flags &= ~CMD_WANT_SKB; } -fail: + if (cmd->reply_page) { iwl_free_pages(trans->shrd, cmd->reply_page); cmd->reply_page = 0;