diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 8 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 8d7bc38fe005..0878b34ee586 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -1899,11 +1899,9 @@ static void __iwl_down(struct iwl_priv *priv) | |||
| 1899 | 1899 | ||
| 1900 | udelay(5); | 1900 | udelay(5); |
| 1901 | 1901 | ||
| 1902 | /* FIXME: apm_ops.suspend(priv) */ | 1902 | /* Stop the device, and put it in low power state */ |
| 1903 | if (exit_pending) | 1903 | priv->cfg->ops->lib->apm_ops.stop(priv); |
| 1904 | priv->cfg->ops->lib->apm_ops.stop(priv); | 1904 | |
| 1905 | else | ||
| 1906 | priv->cfg->ops->lib->apm_ops.reset(priv); | ||
| 1907 | exit: | 1905 | exit: |
| 1908 | memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); | 1906 | memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); |
| 1909 | 1907 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index c347d6631d85..adf4ebe6bb78 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -2576,10 +2576,8 @@ static void __iwl3945_down(struct iwl_priv *priv) | |||
| 2576 | 2576 | ||
| 2577 | udelay(5); | 2577 | udelay(5); |
| 2578 | 2578 | ||
| 2579 | if (exit_pending) | 2579 | /* Stop the device, and put it in low power state */ |
| 2580 | priv->cfg->ops->lib->apm_ops.stop(priv); | 2580 | priv->cfg->ops->lib->apm_ops.stop(priv); |
| 2581 | else | ||
| 2582 | priv->cfg->ops->lib->apm_ops.reset(priv); | ||
| 2583 | 2581 | ||
| 2584 | exit: | 2582 | exit: |
| 2585 | memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); | 2583 | memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp)); |