From: Ivan Khoronzhuk Date: Fri, 11 Nov 2016 14:10:47 +0000 (+0200) Subject: net: ethernet: ti: davinci_cpdma: don't stop ctlr if it was stopped X-Git-Tag: MMI-PSA29.97-13-9~6662^2~285 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b993eec0e1ec4ad1c9d04362afd4fd83261052c9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git net: ethernet: ti: davinci_cpdma: don't stop ctlr if it was stopped No need to stop ctlr if it was already stopped. It can cause timeout warns. Steps: - ifconfig eth0 down - ethtool -l eth0 rx 8 tx 8 - ethtool -l eth0 rx 1 tx 1 Signed-off-by: Ivan Khoronzhuk Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index 56395cefb926..56708a79a18a 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -387,7 +387,7 @@ int cpdma_ctlr_stop(struct cpdma_ctlr *ctlr) int i; spin_lock_irqsave(&ctlr->lock, flags); - if (ctlr->state == CPDMA_STATE_TEARDOWN) { + if (ctlr->state != CPDMA_STATE_ACTIVE) { spin_unlock_irqrestore(&ctlr->lock, flags); return -EINVAL; }