Skip to contentSkip to conversation

alx: fix lockdep annotation

PATCH In review Maarten Lankhorst 2 participants 2 messages Jul 11, 2013

Subsystems (3)
Networking Network drivers Atlx Ethernet drivers
lore
Share & tools
lore

Maarten Lankhorst

author
#0 lore raw

PATCH 1/1 alx: fix lockdep annotation

Move spin_lock_init to be called before the spinlocks are used, preventing a lockdep splat.

Signed-off-by Maarten Lankhorst <[email protected]>

---

drivers/net/ethernet/atheros/alx/main.c +2 -3
index 418de8b..d30085c 100644
@@ -1303,6 +1303,8 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 	alx = netdev_priv(netdev);
+	spin_lock_init(&alx->hw.mdio_lock);
+	spin_lock_init(&alx->irq_lock);
 	alx->dev = netdev;
 	alx->hw.pdev = pdev;
 	alx->msg_enable = NETIF_MSG_LINK | NETIF_MSG_HW | NETIF_MSG_IFUP |

@@ -1385,9 +1387,6 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	INIT_WORK(&alx->link_check_wk, alx_link_check);
 	INIT_WORK(&alx->reset_wk, alx_reset);
-	spin_lock_init(&alx->hw.mdio_lock);
-	spin_lock_init(&alx->irq_lock);
-
 	netif_carrier_off(netdev);
 
 	err = register_netdev(netdev);