Skip to content

Commit

Permalink
stmmac: request_irq when use an ext wake irq line (v2)
Browse files Browse the repository at this point in the history
In case of we use an external Wake-Up IRQ line
(priv->wol_irq != dev->irq) we need to invoke the
request_irq.

Signed-off-by: Francesco Virlinzi <francesco.virlinzi@st.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Francesco Virlinzi authored and David S. Miller committed Feb 15, 2012
1 parent 1cc5a73 commit 7a13f8f
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,17 @@ static int stmmac_open(struct net_device *dev)
goto open_error;
}

/* Request the Wake IRQ in case of another line is used for WoL */
if (priv->wol_irq != dev->irq) {
ret = request_irq(priv->wol_irq, stmmac_interrupt,
IRQF_SHARED, dev->name, dev);
if (unlikely(ret < 0)) {
pr_err("%s: ERROR: allocating the ext WoL IRQ %d "
"(error: %d)\n", __func__, priv->wol_irq, ret);
goto open_error_wolirq;
}
}

/* Enable the MAC Rx/Tx */
stmmac_set_mac(priv->ioaddr, true);

Expand Down Expand Up @@ -1087,6 +1098,9 @@ static int stmmac_open(struct net_device *dev)

return 0;

open_error_wolirq:
free_irq(dev->irq, dev);

open_error:
#ifdef CONFIG_STMMAC_TIMER
kfree(priv->tm);
Expand Down Expand Up @@ -1127,6 +1141,8 @@ static int stmmac_release(struct net_device *dev)

/* Free the IRQ lines */
free_irq(dev->irq, dev);
if (priv->wol_irq != dev->irq)
free_irq(priv->wol_irq, dev);

/* Stop TX/RX DMA and clear the descriptors */
priv->hw->dma->stop_tx(priv->ioaddr);
Expand Down

0 comments on commit 7a13f8f

Please sign in to comment.