Commit 9788864e authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville

iwlwifi: do not clear GEO_CONFIGURED bit when calling _down

The geos information is set up during probe and should only
be removed during pci_remove, not during _down.
This is a temporary fix until the setting of the status bits
have been cleaned up (to explicitly match all setting with
clearing of status bits).
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a97b1f3d
...@@ -6256,6 +6256,8 @@ static void __iwl3945_down(struct iwl3945_priv *priv) ...@@ -6256,6 +6256,8 @@ static void __iwl3945_down(struct iwl3945_priv *priv)
STATUS_RF_KILL_HW | STATUS_RF_KILL_HW |
test_bit(STATUS_RF_KILL_SW, &priv->status) << test_bit(STATUS_RF_KILL_SW, &priv->status) <<
STATUS_RF_KILL_SW | STATUS_RF_KILL_SW |
test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
STATUS_GEO_CONFIGURED |
test_bit(STATUS_IN_SUSPEND, &priv->status) << test_bit(STATUS_IN_SUSPEND, &priv->status) <<
STATUS_IN_SUSPEND; STATUS_IN_SUSPEND;
goto exit; goto exit;
...@@ -6267,6 +6269,8 @@ static void __iwl3945_down(struct iwl3945_priv *priv) ...@@ -6267,6 +6269,8 @@ static void __iwl3945_down(struct iwl3945_priv *priv)
STATUS_RF_KILL_HW | STATUS_RF_KILL_HW |
test_bit(STATUS_RF_KILL_SW, &priv->status) << test_bit(STATUS_RF_KILL_SW, &priv->status) <<
STATUS_RF_KILL_SW | STATUS_RF_KILL_SW |
test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
STATUS_GEO_CONFIGURED |
test_bit(STATUS_IN_SUSPEND, &priv->status) << test_bit(STATUS_IN_SUSPEND, &priv->status) <<
STATUS_IN_SUSPEND | STATUS_IN_SUSPEND |
test_bit(STATUS_FW_ERROR, &priv->status) << test_bit(STATUS_FW_ERROR, &priv->status) <<
......
...@@ -6680,6 +6680,8 @@ static void __iwl4965_down(struct iwl4965_priv *priv) ...@@ -6680,6 +6680,8 @@ static void __iwl4965_down(struct iwl4965_priv *priv)
STATUS_RF_KILL_HW | STATUS_RF_KILL_HW |
test_bit(STATUS_RF_KILL_SW, &priv->status) << test_bit(STATUS_RF_KILL_SW, &priv->status) <<
STATUS_RF_KILL_SW | STATUS_RF_KILL_SW |
test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
STATUS_GEO_CONFIGURED |
test_bit(STATUS_IN_SUSPEND, &priv->status) << test_bit(STATUS_IN_SUSPEND, &priv->status) <<
STATUS_IN_SUSPEND; STATUS_IN_SUSPEND;
goto exit; goto exit;
...@@ -6691,6 +6693,8 @@ static void __iwl4965_down(struct iwl4965_priv *priv) ...@@ -6691,6 +6693,8 @@ static void __iwl4965_down(struct iwl4965_priv *priv)
STATUS_RF_KILL_HW | STATUS_RF_KILL_HW |
test_bit(STATUS_RF_KILL_SW, &priv->status) << test_bit(STATUS_RF_KILL_SW, &priv->status) <<
STATUS_RF_KILL_SW | STATUS_RF_KILL_SW |
test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
STATUS_GEO_CONFIGURED |
test_bit(STATUS_IN_SUSPEND, &priv->status) << test_bit(STATUS_IN_SUSPEND, &priv->status) <<
STATUS_IN_SUSPEND | STATUS_IN_SUSPEND |
test_bit(STATUS_FW_ERROR, &priv->status) << test_bit(STATUS_FW_ERROR, &priv->status) <<
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment