Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8798a5c authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by David S. Miller
Browse files

alx: fix lockdep annotation 



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

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f89e57c4

drivers/net/ethernet/atheros/alx/main.c

+2 −3
Original line number Diff line number Diff line
@@ -1245,6 +1245,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 |
@@ -1327,9 +1329,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);