aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLendacky, Thomas <Thomas.Lendacky@amd.com>2014-12-09 15:54:08 -0500
committerDavid S. Miller <davem@davemloft.net>2014-12-09 21:48:01 -0500
commitf9c5c62db1c9bc20f396c3527b5074c4e7f1c275 (patch)
treeebbfd3b92216a9dace09dacf6c13e7f9ee878d1f /drivers
parent213a9922d173489bfb3c35865c97176039366664 (diff)
amd-xgbe: Use disable_irq_nosync when in IRQ context
The disable_irq_nosync function, not the disable_irq function, must be used to disable the DMA channel interrupt from within the interrupt service routine. Change the disable_irq call to disable_irq_nosync. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/amd/xgbe/xgbe-drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index bedfdb1c430d..bf6bf1118b0f 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -396,7 +396,7 @@ static irqreturn_t xgbe_dma_isr(int irq, void *data)
396 */ 396 */
397 if (napi_schedule_prep(&channel->napi)) { 397 if (napi_schedule_prep(&channel->napi)) {
398 /* Disable Tx and Rx interrupts */ 398 /* Disable Tx and Rx interrupts */
399 disable_irq(channel->dma_irq); 399 disable_irq_nosync(channel->dma_irq);
400 400
401 /* Turn on polling */ 401 /* Turn on polling */
402 __napi_schedule(&channel->napi); 402 __napi_schedule(&channel->napi);