From: Andre Heider <a.heider@gmail.com>
Date: Tue, 12 Jul 2011 10:13:26 +0000 (+0000)
Subject: ps3_gelic: Don't kill the device on DMA failure
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eff896ce0b4231a998d8b3aa81e846ffc4f6c0a4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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;
 }