aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWinkler, Tomas <tomas.winkler@intel.com>2009-01-27 17:27:55 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-02-09 15:03:33 -0500
commit450154e4f471248e188d18e45c2409b37a133765 (patch)
treed6d5952d534348e60499092309e12f63515a795a /drivers/net
parentdfb39e82957153c5748675b72bbe7eded2e2b069 (diff)
iwlwifi: check return value of pci_enable_device
pci_enable_device is tagged with __must_check therefore don't ignore the return value in pci_resume handlers Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c5
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c54a9bcbb2e1..ad6403395e43 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3767,9 +3767,12 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
3767static int iwl_pci_resume(struct pci_dev *pdev) 3767static int iwl_pci_resume(struct pci_dev *pdev)
3768{ 3768{
3769 struct iwl_priv *priv = pci_get_drvdata(pdev); 3769 struct iwl_priv *priv = pci_get_drvdata(pdev);
3770 int ret;
3770 3771
3771 pci_set_power_state(pdev, PCI_D0); 3772 pci_set_power_state(pdev, PCI_D0);
3772 pci_enable_device(pdev); 3773 ret = pci_enable_device(pdev);
3774 if (ret)
3775 return ret;
3773 pci_restore_state(pdev); 3776 pci_restore_state(pdev);
3774 iwl_enable_interrupts(priv); 3777 iwl_enable_interrupts(priv);
3775 3778
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 72ff20e10aa6..346a3018d8a5 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -5824,9 +5824,12 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state)
5824static int iwl3945_pci_resume(struct pci_dev *pdev) 5824static int iwl3945_pci_resume(struct pci_dev *pdev)
5825{ 5825{
5826 struct iwl_priv *priv = pci_get_drvdata(pdev); 5826 struct iwl_priv *priv = pci_get_drvdata(pdev);
5827 int ret;
5827 5828
5828 pci_set_power_state(pdev, PCI_D0); 5829 pci_set_power_state(pdev, PCI_D0);
5829 pci_enable_device(pdev); 5830 ret = pci_enable_device(pdev);
5831 if (ret)
5832 return ret;
5830 pci_restore_state(pdev); 5833 pci_restore_state(pdev);
5831 5834
5832 if (priv->is_open) 5835 if (priv->is_open)