Commit e9c56f8d authored by Maxime Ripard's avatar Maxime Ripard Committed by David S. Miller

net: allwinner: emac: Add missing free_irq

The sun4i-emac driver uses devm_request_irq at .ndo_open time, but relies on
the managed device mechanism to actually free it. This causes an issue whenever
someone wants to restart the interface, the interrupt still being held, and not
yet released.

Fall back to using the regular request_irq at .ndo_open time, and introduce a
free_irq during .ndo_stop.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Cc: stable@vger.kernel.org # 3.11+
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 673498b8
...@@ -717,8 +717,7 @@ static int emac_open(struct net_device *dev) ...@@ -717,8 +717,7 @@ static int emac_open(struct net_device *dev)
if (netif_msg_ifup(db)) if (netif_msg_ifup(db))
dev_dbg(db->dev, "enabling %s\n", dev->name); dev_dbg(db->dev, "enabling %s\n", dev->name);
if (devm_request_irq(db->dev, dev->irq, &emac_interrupt, if (request_irq(dev->irq, &emac_interrupt, 0, dev->name, dev))
0, dev->name, dev))
return -EAGAIN; return -EAGAIN;
/* Initialize EMAC board */ /* Initialize EMAC board */
...@@ -774,6 +773,8 @@ static int emac_stop(struct net_device *ndev) ...@@ -774,6 +773,8 @@ static int emac_stop(struct net_device *ndev)
emac_shutdown(ndev); emac_shutdown(ndev);
free_irq(ndev->irq, ndev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment