diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 17:53:01 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 17:53:01 (GMT) |
| commit | 168268a225d24da3768a88c1029fb3014b0837ca (patch) | |
| tree | afde019a1ac79366df0b96a2fcc8ba50bc5298fa /drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |
| parent | 04ee16bdf486061147c608410c2c9181352aaa3a (diff) | |
| parent | 6f1989bc982bc176b0d63e028e9b7f23ae1b4583 (diff) | |
| download | linux-fsl-qoriq-168268a225d24da3768a88c1029fb3014b0837ca.tar.xz | |
Merge 'mmc/upstream' into late/mvebu2
These patches from the mmc tree were merged into v3.9 already
and the later mvebu patches depend on them.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 6098fd4a..69e321a 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -1963,10 +1963,12 @@ unwind: while (--i >= 0) { nf = &pbuf->frag_array[i+1]; pci_unmap_page(pdev, nf->dma, nf->length, PCI_DMA_TODEVICE); + nf->dma = 0ULL; } nf = &pbuf->frag_array[0]; pci_unmap_single(pdev, nf->dma, skb_headlen(skb), PCI_DMA_TODEVICE); + nf->dma = 0ULL; out_err: return -ENOMEM; |