diff options
| author | David S. Miller | 2017-01-09 21:39:11 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-01-09 21:39:11 +0100 |
| commit | bb1d3034449ed08e2ffbf5813a5ad9fa30475359 (patch) | |
| tree | a48cc17fc4683b5fdc1656ac71639540bd8852e2 /drivers/net/ethernet/amd/xgbe | |
| parent | Merge branch 'dwmac-dwc-qos-eth' (diff) | |
| parent | phy state machine: failsafe leave invalid RUNNING state (diff) | |
| download | kernel-qcow2-linux-bb1d3034449ed08e2ffbf5813a5ad9fa30475359.tar.gz kernel-qcow2-linux-bb1d3034449ed08e2ffbf5813a5ad9fa30475359.tar.xz kernel-qcow2-linux-bb1d3034449ed08e2ffbf5813a5ad9fa30475359.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/amd/xgbe')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 |
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 130de11fa553..f8648e4dbca3 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) } } +isr_done: /* If there is not a separate AN irq, handle it here */ if (pdata->dev_irq == pdata->an_irq) pdata->phy_if.an_isr(irq, pdata); @@ -551,7 +552,6 @@ static irqreturn_t xgbe_isr(int irq, void *data) if (pdata->vdata->i2c_support && (pdata->dev_irq == pdata->i2c_irq)) pdata->i2c_if.i2c_isr(irq, pdata); -isr_done: return IRQ_HANDLED; } |