diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2009-08-03 15:58:47 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-07 13:09:30 -0400 |
commit | 37055bd455b31b8220c35a1ede9c6aceb791cc88 (patch) | |
tree | 878573cda336195e64c88ae3331a563ef5ccfbfe /drivers/net/wireless/mwl8k.c | |
parent | 4ff6432ea620ba467e50ec04b8271ea0eb94e62e (diff) |
mwl8k: call pci_unmap_single() before accessing command structure again
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 9643aa4751c..25423c05aff 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -1593,6 +1593,9 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd) | |||
1593 | timeout = wait_for_completion_timeout(&cmd_wait, | 1593 | timeout = wait_for_completion_timeout(&cmd_wait, |
1594 | msecs_to_jiffies(MWL8K_CMD_TIMEOUT_MS)); | 1594 | msecs_to_jiffies(MWL8K_CMD_TIMEOUT_MS)); |
1595 | 1595 | ||
1596 | pci_unmap_single(priv->pdev, dma_addr, dma_size, | ||
1597 | PCI_DMA_BIDIRECTIONAL); | ||
1598 | |||
1596 | result = &cmd->result; | 1599 | result = &cmd->result; |
1597 | if (!timeout) { | 1600 | if (!timeout) { |
1598 | spin_lock_irq(&priv->fw_lock); | 1601 | spin_lock_irq(&priv->fw_lock); |
@@ -1612,8 +1615,6 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd) | |||
1612 | *result); | 1615 | *result); |
1613 | } | 1616 | } |
1614 | 1617 | ||
1615 | pci_unmap_single(priv->pdev, dma_addr, dma_size, | ||
1616 | PCI_DMA_BIDIRECTIONAL); | ||
1617 | return rc; | 1618 | return rc; |
1618 | } | 1619 | } |
1619 | 1620 | ||