diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-12-31 06:46:42 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-03 09:34:11 -0500 |
| commit | abae2386d55aff1d395cdb665f03684c227a6a69 (patch) | |
| tree | dfa4d78c306f6a17d7c6b170531b760c17055af4 /drivers/net/wireless/iwlwifi/pcie | |
| parent | c8f9b0feab564e1ecf460b440e838673aced282c (diff) | |
iwlwifi: always check that grab_nic_access succeeds
This allows to let sparse check that the NIC access is
always released.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/trans.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index bca620363037..db3b0552b2eb 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c | |||
| @@ -795,7 +795,7 @@ static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr, | |||
| 795 | u32 *vals = buf; | 795 | u32 *vals = buf; |
| 796 | 796 | ||
| 797 | spin_lock_irqsave(&trans->reg_lock, flags); | 797 | spin_lock_irqsave(&trans->reg_lock, flags); |
| 798 | if (likely(iwl_trans_grab_nic_access(trans, false))) { | 798 | if (iwl_trans_grab_nic_access(trans, false)) { |
| 799 | iwl_write32(trans, HBUS_TARG_MEM_RADDR, addr); | 799 | iwl_write32(trans, HBUS_TARG_MEM_RADDR, addr); |
| 800 | for (offs = 0; offs < dwords; offs++) | 800 | for (offs = 0; offs < dwords; offs++) |
| 801 | vals[offs] = iwl_read32(trans, HBUS_TARG_MEM_RDAT); | 801 | vals[offs] = iwl_read32(trans, HBUS_TARG_MEM_RDAT); |
| @@ -815,7 +815,7 @@ static int iwl_trans_pcie_write_mem(struct iwl_trans *trans, u32 addr, | |||
| 815 | u32 *vals = buf; | 815 | u32 *vals = buf; |
| 816 | 816 | ||
| 817 | spin_lock_irqsave(&trans->reg_lock, flags); | 817 | spin_lock_irqsave(&trans->reg_lock, flags); |
| 818 | if (likely(iwl_trans_grab_nic_access(trans, false))) { | 818 | if (iwl_trans_grab_nic_access(trans, false)) { |
| 819 | iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr); | 819 | iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr); |
| 820 | for (offs = 0; offs < dwords; offs++) | 820 | for (offs = 0; offs < dwords; offs++) |
| 821 | iwl_write32(trans, HBUS_TARG_MEM_WDAT, vals[offs]); | 821 | iwl_write32(trans, HBUS_TARG_MEM_WDAT, vals[offs]); |