From a4ec08579b73d55a101b972f78b383b3d5e90f5d Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Tue, 12 Jul 2011 10:13:26 +0000 Subject: [PATCH] --- yaml --- r: 256305 b: refs/heads/master c: eff896ce0b4231a998d8b3aa81e846ffc4f6c0a4 h: refs/heads/master i: 256303: 5d0e1362ca5522efbb9fa0b4335da34a2d953da8 v: v3 --- [refs] | 2 +- trunk/drivers/net/ps3_gelic_net.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a04a71bb5262..2260ca4587ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb4f85ce1731d78648870333f0ce77123fa162e6 +refs/heads/master: eff896ce0b4231a998d8b3aa81e846ffc4f6c0a4 diff --git a/trunk/drivers/net/ps3_gelic_net.c b/trunk/drivers/net/ps3_gelic_net.c index 94422fcc8576..4acc17bffc42 100644 --- a/trunk/drivers/net/ps3_gelic_net.c +++ b/trunk/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; }