Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88036
b: refs/heads/master
c: 539e6f8
h: refs/heads/master
v: v3
  • Loading branch information
Michael Buesch authored and John W. Linville committed Apr 1, 2008
1 parent a206463 commit 88139d1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 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: 64f851e410ae37a0990212ae34f0c96b641478f7
refs/heads/master: 539e6f8cffe9299fbf813ad574535b90ac370031
7 changes: 6 additions & 1 deletion trunk/drivers/net/wireless/b43/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
}

if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
b43err(ring->dev->wl, "RX DMA buffer allocation failed\n");
dev_kfree_skb_any(skb);
return -EIO;
}
Expand Down Expand Up @@ -874,8 +875,12 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
DMA_TO_DEVICE);

if (b43_dma_mapping_error(ring, dma_test,
b43_txhdr_size(dev), 1))
b43_txhdr_size(dev), 1)) {

b43err(dev->wl,
"TXHDR DMA allocation failed\n");
goto err_kfree_txhdr_cache;
}
}

dma_unmap_single(dev->dev->dev,
Expand Down

0 comments on commit 88139d1

Please sign in to comment.