diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /drivers/net/r8169.c | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index a3e3895e5032..0f6f9747d255 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
| @@ -2792,7 +2792,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, | |||
| 2792 | pkt_size, PCI_DMA_FROMDEVICE); | 2792 | pkt_size, PCI_DMA_FROMDEVICE); |
| 2793 | rtl8169_mark_to_asic(desc, tp->rx_buf_sz); | 2793 | rtl8169_mark_to_asic(desc, tp->rx_buf_sz); |
| 2794 | } else { | 2794 | } else { |
| 2795 | pci_unmap_single(pdev, addr, pkt_size, | 2795 | pci_unmap_single(pdev, addr, tp->rx_buf_sz, |
| 2796 | PCI_DMA_FROMDEVICE); | 2796 | PCI_DMA_FROMDEVICE); |
| 2797 | tp->Rx_skbuff[entry] = NULL; | 2797 | tp->Rx_skbuff[entry] = NULL; |
| 2798 | } | 2798 | } |