diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 22:17:10 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 22:17:10 +0100 |
| commit | a9037430c6c784165a940a90bcd29f886834c8e7 (patch) | |
| tree | 4b186e0a761e93a6c6712053d444b566c0d25338 /drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |
| parent | 6125bc8b86d9da75ddac77e38f41afbf9f5de3e3 (diff) | |
| parent | 12ad10004645d38356b14d1fbba379c523a61916 (diff) | |
Merge branch 'timers/for-arm' into timers/core
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 6098fd4adfe..69e321a6507 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; |