lkml.org 
[lkml]   [2013]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 27/79] alx: fix lockdep annotation
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Maarten Lankhorst <maarten.lankhorst@canonical.com>

    [ 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>
    ---
    drivers/net/ethernet/atheros/alx/main.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    --- 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 *pde

    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 *pde

    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);



    \
     
     \ /
      Last update: 2013-07-27 04:01    [W:4.112 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site