diff options
| author | Andre Heider <a.heider@gmail.com> | 2011-07-12 14:13:26 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-14 21:12:16 +0400 |
| commit | eff896ce0b4231a998d8b3aa81e846ffc4f6c0a4 (patch) | |
| tree | cbd3e0ec1907949abe21d0c136439c91b0a5cd1c /drivers/net/ps3_gelic_net.c | |
| parent | bb4f85ce1731d78648870333f0ce77123fa162e6 (diff) | |
| download | linux-eff896ce0b4231a998d8b3aa81e846ffc4f6c0a4.tar.xz | |
ps3_gelic: Don't kill the device on DMA failure
Reset card->tx_dma_progress when lv1_net_start_tx_dma() fails or it
won't send anything afterwards anymore
Signed-off-by: Andre Heider <a.heider@gmail.com>
Acked-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ps3_gelic_net.c')
| -rw-r--r-- | drivers/net/ps3_gelic_net.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 94422fcc8576..4acc17bffc42 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c @@ -838,9 +838,11 @@ static int gelic_card_kick_txdma(struct gelic_card *card, card->tx_dma_progress = 1; status = lv1_net_start_tx_dma(bus_id(card), dev_id(card), descr->bus_addr, 0); - if (status) + if (status) { + card->tx_dma_progress = 0; dev_info(ctodev(card), "lv1_net_start_txdma failed," \ "status=%d\n", status); + } } return status; } |