37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
|
|
Date: Thu, 11 Jul 2013 15:53:21 +0200
|
|
Subject: [8/8] alx: fix lockdep annotation
|
|
Origin: https://git.kernel.org/linus/a8798a5c77c9981e88caef1373a3310bf8aed219
|
|
|
|
Move spin_lock_init to be called before the spinlocks are used, preventing a lockdep splat.
|
|
|
|
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/atheros/alx/main.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
|
|
index 0e0b242..027398e 100644
|
|
--- a/drivers/net/ethernet/atheros/alx/main.c
|
|
+++ b/drivers/net/ethernet/atheros/alx/main.c
|
|
@@ -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);
|