lkml.org 
[lkml]   [2011]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [52/139] r8169: fix sleeping while holding spinlock.
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: françois romieu <romieu@fr.zoreil.com>

    [ Upstream commit ea80907ff066edd1dd43c5fe90ae6677d15e6384 ]

    As device_set_wakeup_enable can now sleep, move the call to outside
    the critical section.

    Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
    Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Andrew Hendry <andrew.hendry@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    drivers/net/r8169.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    Index: linux-2.6.35.y/drivers/net/r8169.c
    ===================================================================
    --- linux-2.6.35.y.orig/drivers/net/r8169.c
    +++ linux-2.6.35.y/drivers/net/r8169.c
    @@ -855,10 +855,10 @@ static int rtl8169_set_wol(struct net_de
    else
    tp->features &= ~RTL_FEATURE_WOL;
    __rtl8169_set_wol(tp, wol->wolopts);
    - device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts);
    -
    spin_unlock_irq(&tp->lock);

    + device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts);
    +
    return 0;
    }

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2011-02-02 02:05    [W:6.026 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site