aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLendacky, Thomas <Thomas.Lendacky@amd.com>2017-01-04 16:07:16 -0500
committerDavid S. Miller <davem@davemloft.net>2017-01-06 15:34:05 -0500
commit896b4db685cf06bd7d50ed22c53ebd069e0b90e9 (patch)
treee52b4bbcac0bcb007e3f3b302d38148469657614
parent0f1f9cbc04dbb3cc310f70a11cba0cf1f2109d9c (diff)
amd-xgbe: Fix IRQ processing when running in single IRQ mode
When running in single IRQ mode, the additional IRQ routines were being skipped because only the XGMAC interrupt status was being checked. Update the code so that the additional IRQ routines are checked whenever an interrupt is received. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-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 155190db682d..9943629fcbf9 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -539,6 +539,7 @@ static irqreturn_t xgbe_isr(int irq, void *data)
539 } 539 }
540 } 540 }
541 541
542isr_done:
542 /* If there is not a separate AN irq, handle it here */ 543 /* If there is not a separate AN irq, handle it here */
543 if (pdata->dev_irq == pdata->an_irq) 544 if (pdata->dev_irq == pdata->an_irq)
544 pdata->phy_if.an_isr(irq, pdata); 545 pdata->phy_if.an_isr(irq, pdata);
@@ -551,7 +552,6 @@ static irqreturn_t xgbe_isr(int irq, void *data)
551 if (pdata->vdata->i2c_support && (pdata->dev_irq == pdata->i2c_irq)) 552 if (pdata->vdata->i2c_support && (pdata->dev_irq == pdata->i2c_irq))
552 pdata->i2c_if.i2c_isr(irq, pdata); 553 pdata->i2c_if.i2c_isr(irq, pdata);
553 554
554isr_done:
555 return IRQ_HANDLED; 555 return IRQ_HANDLED;
556} 556}
557 557