2009-01-27 10:00:49

by Rami Rosen

Subject: [PATCH ] iwlwifi: fix iwlwifi warning (pci_enable_device).

This patch fixes build warnings which are caused as a result
of iwl-agn.c and iwl3945-base.c resume methods.

Signed-off-by: Rami Rosen <[email protected]>

--
(wireless-testing)

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c
b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 757a9bd..7cf727c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -4117,7 +4117,10 @@ static int iwl_pci_resume(struct pci_dev *pdev)
struct iwl_priv *priv = pci_get_drvdata(pdev);

pci_set_power_state(pdev, PCI_D0);
- pci_enable_device(pdev);
+ if (pci_enable_device(pdev)) {
+ printk(KERN_ERR "pci_enable_device failed on resume\n");
+ return -ENODEV;
+ }
pci_restore_state(pdev);
iwl_enable_interrupts(priv);

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c
b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 25a3508..3ca24d1 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6307,7 +6307,10 @@ static int iwl3945_pci_resume(struct pci_dev *pdev)
struct iwl_priv *priv = pci_get_drvdata(pdev);

pci_set_power_state(pdev, PCI_D0);
- pci_enable_device(pdev);
+ if (pci_enable_device(pdev)) {
+ printk(KERN_ERR "pci_enable_device failed on resume\n");
+ return -ENODEV;
+ }
pci_restore_state(pdev);

if (priv->is_open)

2009-01-27 16:48:34

by Reinette Chatre

Subject: Re: [PATCH ] iwlwifi: fix iwlwifi warning (pci_enable_device).

On Tue, 2009-01-27 at 02:00 -0800, Rami Rosen wrote:
> This patch fixes build warnings which are caused as a result
> of iwl-agn.c and iwl3945-base.c resume methods.
>
> Signed-off-by: Rami Rosen <[email protected]>
>
> --
> (wireless-testing)

We actually have a fix queued for this and would prefer to use it
instead because it returns the error from pci_enable_device() instead of
a generic "ENODEV".

Reinette