diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-12-31 06:15:36 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-03 09:32:26 -0500 |
| commit | 653ea7a6a5a912a96affc6443b6e9f42dfce2234 (patch) | |
| tree | 363613d78e76e4ba66e2250ac94cdc9593082a56 | |
| parent | 4fd442db98dadf33ecce6d489bbbc95f6e8d3b31 (diff) | |
iwlwifi: don't treat a bool as an error code
iwl_trans_grab_nic_access returns a boolean. So ret should
explicitely set to an error code and not rely on the value
returned by iwl_trans_grab_nic_access.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index 9c1f055f4316..1ed4bc694d29 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c | |||
| @@ -459,11 +459,11 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) | |||
| 459 | base = priv->device_pointers.error_event_table; | 459 | base = priv->device_pointers.error_event_table; |
| 460 | if (iwlagn_hw_valid_rtc_data_addr(base)) { | 460 | if (iwlagn_hw_valid_rtc_data_addr(base)) { |
| 461 | spin_lock_irqsave(&priv->trans->reg_lock, flags); | 461 | spin_lock_irqsave(&priv->trans->reg_lock, flags); |
| 462 | ret = iwl_trans_grab_nic_access(priv->trans, true); | 462 | if (iwl_trans_grab_nic_access(priv->trans, true)) { |
| 463 | if (likely(ret == 0)) { | ||
| 464 | iwl_write32(priv->trans, HBUS_TARG_MEM_RADDR, base); | 463 | iwl_write32(priv->trans, HBUS_TARG_MEM_RADDR, base); |
| 465 | status = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT); | 464 | status = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT); |
| 466 | iwl_trans_release_nic_access(priv->trans); | 465 | iwl_trans_release_nic_access(priv->trans); |
| 466 | ret = 0; | ||
| 467 | } | 467 | } |
| 468 | spin_unlock_irqrestore(&priv->trans->reg_lock, flags); | 468 | spin_unlock_irqrestore(&priv->trans->reg_lock, flags); |
| 469 | 469 | ||