Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342154
b: refs/heads/master
c: cae49ed
h: refs/heads/master
v: v3
  • Loading branch information
David Woodhouse authored and David S. Miller committed Dec 12, 2012
1 parent ff82bc6 commit c1eb40a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fda4d85d6124134dd7c72d6559bd275732eb39b9
refs/heads/master: cae49ede00ec3d0cda290b03fee55b72b49efc11
5 changes: 3 additions & 2 deletions trunk/drivers/atm/solos-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -945,10 +945,11 @@ static uint32_t fpga_tx(struct solos_card *card)
for (port = 0; tx_pending; tx_pending >>= 1, port++) {
if (tx_pending & 1) {
struct sk_buff *oldskb = card->tx_skb[port];
if (oldskb)
if (oldskb) {
pci_unmap_single(card->dev, SKB_CB(oldskb)->dma_addr,
oldskb->len, PCI_DMA_TODEVICE);

card->tx_skb[port] = NULL;
}
spin_lock(&card->tx_queue_lock);
skb = skb_dequeue(&card->tx_queue[port]);
if (!skb)
Expand Down

0 comments on commit c1eb40a

Please sign in to comment.