From patchwork Mon Nov 8 23:23:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 70479 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8F9D7B6EF1 for ; Tue, 9 Nov 2010 10:29:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754931Ab0KHX3N (ORCPT ); Mon, 8 Nov 2010 18:29:13 -0500 Received: from 254.185.140-88.rev.gaoland.net ([88.140.185.254]:60180 "EHLO electric-eye.fr.zoreil.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754165Ab0KHX3N (ORCPT ); Mon, 8 Nov 2010 18:29:13 -0500 Received: from electric-eye.fr.zoreil.com (localhost [127.0.0.1]) by electric-eye.fr.zoreil.com (8.14.4/8.14.3) with ESMTP id oA8NO0lQ013732; Tue, 9 Nov 2010 00:24:01 +0100 Received: (from romieu@localhost) by electric-eye.fr.zoreil.com (8.14.4/8.14.4/Submit) id oA8NNwfg013731; Tue, 9 Nov 2010 00:23:58 +0100 X-Authentication-Warning: electric-eye.fr.zoreil.com: romieu set sender to romieu@fr.zoreil.com using -f Date: Tue, 9 Nov 2010 00:23:58 +0100 From: Francois Romieu To: netdev@vger.kernel.org Cc: "David S. Miller" , Daniel J Blueman , "Rafael J. Wysocki" Subject: [PATCH 2/2] r8169: fix sleeping while holding spinlock. Message-ID: <20101108232358.GB13720@electric-eye.fr.zoreil.com> MIME-Version: 1.0 Content-Disposition: inline X-Organisation: Land of Sunshine Inc. User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As device_set_wakeup_enable can now sleep, move the call to outside the critical section. Signed-off-by: Daniel J Blueman Acked-by: Rafael J. Wysocki Acked-by: Andrew Hendry --- drivers/net/r8169.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 3a0877e..4c4d169 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -846,10 +846,10 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 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; }