From 57d4fd2494e1e7c873307e08ecfc95ef4b947ee5 Mon Sep 17 00:00:00 2001 From: "Winkler, Tomas" Date: Tue, 27 Jan 2009 14:27:55 -0800 Subject: [PATCH] --- yaml --- r: 134367 b: refs/heads/master c: 450154e4f471248e188d18e45c2409b37a133765 h: refs/heads/master i: 134365: 5c59285d9d409d88eb4474f1dcf75635b6366e33 134363: 04f63b989a54249e20ab02abe5bee092bc65f17f 134359: 25acb72b849d6ca4d1b48fab0a5db5df93ca8967 134351: bcda6acdebfe67e73ceaadc659635391ab3dfc58 134335: 0547c32da42854cb220272ce8d40ea2f4f64e95c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 5 ++++- trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8c9de24ce864..85ed4387eeac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfb39e82957153c5748675b72bbe7eded2e2b069 +refs/heads/master: 450154e4f471248e188d18e45c2409b37a133765 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index c54a9bcbb2e1..ad6403395e43 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3767,9 +3767,12 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state) static int iwl_pci_resume(struct pci_dev *pdev) { struct iwl_priv *priv = pci_get_drvdata(pdev); + int ret; pci_set_power_state(pdev, PCI_D0); - pci_enable_device(pdev); + ret = pci_enable_device(pdev); + if (ret) + return ret; pci_restore_state(pdev); iwl_enable_interrupts(priv); diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c index 72ff20e10aa6..346a3018d8a5 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -5824,9 +5824,12 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state) static int iwl3945_pci_resume(struct pci_dev *pdev) { struct iwl_priv *priv = pci_get_drvdata(pdev); + int ret; pci_set_power_state(pdev, PCI_D0); - pci_enable_device(pdev); + ret = pci_enable_device(pdev); + if (ret) + return ret; pci_restore_state(pdev); if (priv->is_open)