Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index fd142bee9189..87a9fd8e41eb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -533,9 +533,10 @@ int iwlagn_send_tx_power(struct iwl_priv *priv)
 
 void iwlagn_temperature(struct iwl_priv *priv)
 {
-        /* store temperature from statistics (in Celsius) */
-        priv->temperature =
-                le32_to_cpu(priv->_agn.statistics.general.common.temperature);
+        /* store temperature from correct statistics (in Celsius) */
+        priv->temperature = le32_to_cpu((iwl_bt_statistics(priv)) ?
+                priv->_agn.statistics_bt.general.common.temperature :
+                priv->_agn.statistics.general.common.temperature);
         iwl_tt_handler(priv);
 }