diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-07-11 15:53:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-28 16:29:58 -0700 |
| commit | 61b6f1280da836ca67e6e4cfaefd65e989f6bfbc (patch) | |
| tree | e2f1d996f195507208c924890674bc657e284f07 | |
| parent | 53effe1697676189395fc9f8a02c749e19cc9daa (diff) | |
| download | linux-3.10-61b6f1280da836ca67e6e4cfaefd65e989f6bfbc.tar.gz linux-3.10-61b6f1280da836ca67e6e4cfaefd65e989f6bfbc.tar.bz2 linux-3.10-61b6f1280da836ca67e6e4cfaefd65e989f6bfbc.zip | |
alx: fix lockdep annotation
[ Upstream commit 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/atheros/alx/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c index 418de8b1316..d30085c2b45 100644 --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c @@ -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); |