diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-17 18:14:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-17 18:14:21 +0200 |
| commit | 32535bd5637d3152f944f124bcc82d498892ba1b (patch) | |
| tree | 99d33b58cfec44f4cf95fad5efa75aea0dd7d60b /drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | |
| parent | Revert "USB: serial: sierra: put reset_resume callback back." (diff) | |
| parent | ARM: EXYNOS: Add s3c-hsotg device support for Universal C210 board (diff) | |
| download | linux-32535bd5637d3152f944f124bcc82d498892ba1b.tar.xz linux-32535bd5637d3152f944f124bcc82d498892ba1b.zip | |
Merge branch 'v3.5-for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into usb-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index 8b1a7988e176..aa7aea168138 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c @@ -374,8 +374,9 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans, if (WARN_ON(!rxb)) return; + rxcb.truesize = PAGE_SIZE << hw_params(trans).rx_page_order; dma_unmap_page(trans->dev, rxb->page_dma, - PAGE_SIZE << hw_params(trans).rx_page_order, + rxcb.truesize, DMA_FROM_DEVICE); rxcb._page = rxb->page; |