Return-path: Received: from mail.atheros.com ([12.36.123.2]:52948 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059AbZHMEEN (ORCPT ); Thu, 13 Aug 2009 00:04:13 -0400 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Wed, 12 Aug 2009 21:04:15 -0700 From: Sujith MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Message-ID: <19075.37075.80646.894418@gargle.gargle.HOWL> Date: Thu, 13 Aug 2009 09:34:35 +0530 To: CC: Subject: [PATCH 3/4] ath9k: Fix bug in PCI resume Sender: linux-wireless-owner@vger.kernel.org List-ID: This patch fixes a bug where the device was enabled before restoring the PCI state. Signed-off-by: Sujith --- drivers/net/wireless/ath/ath9k/pci.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 3546504..616bdff 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c @@ -253,10 +253,12 @@ static int ath_pci_resume(struct pci_dev *pdev) u32 val; int err; + pci_restore_state(pdev); + err = pci_enable_device(pdev); if (err) return err; - pci_restore_state(pdev); + /* * Suspend/Resume resets the PCI configuration space, so we have to * re-disable the RETRY_TIMEOUT register (0x41) to keep -- 1.6.4