Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327999
b: refs/heads/master
c: 1d3ff76
h: refs/heads/master
i:
  327997: 7632da6
  327995: 1fb2e69
  327991: 184d11d
  327983: a341045
  327967: 5584619
  327935: 3ebd1de
v: v3
  • Loading branch information
Mika Westerberg authored and David S. Miller committed Sep 19, 2012
1 parent 0309807 commit 519c6eb
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 6b78f16e4bdde3936b11690bdb970be423e07a07
refs/heads/master: 1d3ff76759b70e201e6b379c37ac106c487ff506
4 changes: 2 additions & 2 deletions trunk/drivers/net/ethernet/i825xx/znet.c
Original file line number Diff line number Diff line change
Expand Up @@ -865,14 +865,14 @@ static void hardware_init(struct net_device *dev)
disable_dma(znet->rx_dma); /* reset by an interrupting task. */
clear_dma_ff(znet->rx_dma);
set_dma_mode(znet->rx_dma, DMA_RX_MODE);
set_dma_addr(znet->rx_dma, (unsigned int) znet->rx_start);
set_dma_addr(znet->rx_dma, isa_virt_to_bus(znet->rx_start));
set_dma_count(znet->rx_dma, RX_BUF_SIZE);
enable_dma(znet->rx_dma);
/* Now set up the Tx channel. */
disable_dma(znet->tx_dma);
clear_dma_ff(znet->tx_dma);
set_dma_mode(znet->tx_dma, DMA_TX_MODE);
set_dma_addr(znet->tx_dma, (unsigned int) znet->tx_start);
set_dma_addr(znet->tx_dma, isa_virt_to_bus(znet->tx_start));
set_dma_count(znet->tx_dma, znet->tx_buf_len<<1);
enable_dma(znet->tx_dma);
release_dma_lock(flags);
Expand Down

0 comments on commit 519c6eb

Please sign in to comment.