Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935962AbXEUT41 (ORCPT ); Mon, 21 May 2007 15:56:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934163AbXEUTaB (ORCPT ); Mon, 21 May 2007 15:30:01 -0400 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:52711 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934162AbXEUT37 (ORCPT ); Mon, 21 May 2007 15:29:59 -0400 Message-Id: <20070521191722.373844000@sous-sol.org> References: <20070521191612.800400000@sous-sol.org> User-Agent: quilt/0.46-1 Date: Mon, 21 May 2007 12:16:38 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, "Michael Chan" , David S Miller Subject: [patch 26/69] BNX2: Save PCI state during suspend. Content-Disposition: inline; filename=bnx2-save-pci-state-during-suspend.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1231 Lines: 42 -stable review patch. If anyone has any objections, please let us know. --------------------- From: This is needed to save the MSI state which will be lost during suspend. Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- --- drivers/net/bnx2.c | 2 ++ 1 file changed, 2 insertions(+) --- linux-2.6.21.1.orig/drivers/net/bnx2.c +++ linux-2.6.21.1/drivers/net/bnx2.c @@ -6148,6 +6148,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_me reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL; bnx2_reset_chip(bp, reset_code); bnx2_free_skbs(bp); + pci_save_state(pdev); bnx2_set_power_state(bp, pci_choose_state(pdev, state)); return 0; } @@ -6161,6 +6162,7 @@ bnx2_resume(struct pci_dev *pdev) if (!netif_running(dev)) return 0; + pci_restore_state(pdev); bnx2_set_power_state(bp, PCI_D0); netif_device_attach(dev); bnx2_init_nic(bp); -- - 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/