From: Adrian Bunk <bunk@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>, linville@tuxdriver.com
Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: [-mm patch] iwl-base.c bugfixes
Date: Mon, 27 Aug 2007 23:29:34 +0200 [thread overview]
Message-ID: <20070827212934.GI26410@stusta.de> (raw)
In-Reply-To: <20070822020648.5ea3a612.akpm@linux-foundation.org>
On Wed, Aug 22, 2007 at 02:06:48AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.23-rc2-mm2:
>...
> git-wireless.patch
>...
> git trees
>...
This patch fixes two obvious bugs.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
drivers/net/wireless/iwl-base.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
600ffdc11b25ac0aee15271d1b2ce99a367efa31
diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c
index b8293fe..f65c30e 100644
--- a/drivers/net/wireless/iwl-base.c
+++ b/drivers/net/wireless/iwl-base.c
@@ -343,7 +343,7 @@ int iwl_tx_queue_init(struct iwl_priv *priv,
* command is very huge the system will not have two scan at the
* same time */
len = sizeof(struct iwl_cmd) * slots_num;
- if (txq_id == IWL_CMD_QUEUE_NUM);
+ if (txq_id == IWL_CMD_QUEUE_NUM)
len += IWL_MAX_SCAN_SIZE;
txq->cmd = pci_alloc_consistent(dev, len, &txq->dma_addr_cmd);
if (!txq->cmd)
@@ -390,7 +390,7 @@ void iwl_tx_queue_free(struct iwl_priv *priv, struct iwl_tx_queue *txq)
iwl_hw_txq_free_tfd(priv, txq);
len = sizeof(struct iwl_cmd) * q->n_window;
- if (q->id == IWL_CMD_QUEUE_NUM);
+ if (q->id == IWL_CMD_QUEUE_NUM)
len += IWL_MAX_SCAN_SIZE;
pci_free_consistent(dev, len, txq->cmd, txq->dma_addr_cmd);
next prev parent reply other threads:[~2007-08-27 21:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070822020648.5ea3a612.akpm@linux-foundation.org>
2007-08-22 19:16 ` 2.6.23-rc3-mm1: net/wireless/rt2x00mac.c build failure Mariusz Kozlowski
2007-08-22 19:31 ` Ivo van Doorn
2007-08-22 19:54 ` Mariusz Kozlowski
2007-08-22 20:12 ` Ivo van Doorn
2007-08-22 20:22 ` Rafael J. Wysocki
2007-08-22 19:58 ` John W. Linville
2007-08-25 0:27 ` Ulrich Kunitz
2007-08-27 21:29 ` Adrian Bunk [this message]
2007-08-27 22:34 ` [-mm patch] iwl-base.c bugfixes Tomas Winkler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070827212934.GI26410@stusta.de \
--to=bunk@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).