summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
authorStephen Hemminger <stephen@networkplumber.org>2017-12-12 10:30:29 -0800
committerDavid S. Miller <davem@davemloft.net>2017-12-13 15:47:00 -0500
commitc009cb842fcc0f84536a9d2692e6f063af5ac5c6 (patch)
treeb5acf6da6febd98b3b301608f9db27b7c96d8254 /drivers/net/ethernet/marvell
parent3b3397e2031564db07022e99f04d4b9f3df6fced (diff)
downloadlinux-c009cb842fcc0f84536a9d2692e6f063af5ac5c6.tar.bz2
skge: remove redundunt free_irq under spinlock
The code to handle multi-port SKGE boards was freeing IRQ twice. The first one was under lock and might sleep. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
-rw-r--r--drivers/net/ethernet/marvell/skge.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 6e423f098a60..31efc47c847e 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -4081,7 +4081,6 @@ static void skge_remove(struct pci_dev *pdev)
if (hw->ports > 1) {
skge_write32(hw, B0_IMSK, 0);
skge_read32(hw, B0_IMSK);
- free_irq(pdev->irq, hw);
}
spin_unlock_irq(&hw->hw_lock);