From 043412f26e28131fc3d418019361fd5d1bba62b3 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 5 Nov 2012 06:22:20 +0000 Subject: [PATCH] --- yaml --- r: 340661 b: refs/heads/master c: b821bd8e5a4413c8e28e64d878720978883ebfc8 h: refs/heads/master i: 340659: ad5941e59e0f2cf3d7efb26297aebc1e4bd10f4f v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/calxeda/xgmac.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7afe07e9869d..9a4fbf224b32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0aefa8ecd81f4f4b3f7f336aa152b13cc79c4bfe +refs/heads/master: b821bd8e5a4413c8e28e64d878720978883ebfc8 diff --git a/trunk/drivers/net/ethernet/calxeda/xgmac.c b/trunk/drivers/net/ethernet/calxeda/xgmac.c index 7f5fd17c8002..728fcef4e685 100644 --- a/trunk/drivers/net/ethernet/calxeda/xgmac.c +++ b/trunk/drivers/net/ethernet/calxeda/xgmac.c @@ -966,7 +966,7 @@ static int xgmac_hw_init(struct net_device *dev) ctrl |= XGMAC_CONTROL_IPC; writel(ctrl, ioaddr + XGMAC_CONTROL); - writel(DMA_CONTROL_DFF | DMA_CONTROL_OSF, ioaddr + XGMAC_DMA_CONTROL); + writel(DMA_CONTROL_OSF, ioaddr + XGMAC_DMA_CONTROL); /* Set the HW DMA mode and the COE */ writel(XGMAC_OMR_TSF | XGMAC_OMR_RFD | XGMAC_OMR_RFA | @@ -1180,8 +1180,6 @@ static int xgmac_rx(struct xgmac_priv *priv, int limit) xgmac_rx_refill(priv); - writel(1, priv->base + XGMAC_DMA_RX_POLL); - return count; }