diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 22:08:29 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 22:08:29 +0300 |
| commit | ae0008c71a192abe6f0fed7082d5e5b1cadfd4e7 (patch) | |
| tree | 2bef14ef257315aac5502a5d3f90a3417e938182 /drivers/net/wireless/ath/ath6kl/bmi.h | |
| parent | 917d083d48f50537b21c8761e2366bf229ed9f5d (diff) | |
| parent | a006827a152c3f4d09324157096c8f89cf7ddca3 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/bmi.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/bmi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/bmi.h b/drivers/net/wireless/ath/ath6kl/bmi.h index 18fdd69e1f71..397a52f2628b 100644 --- a/drivers/net/wireless/ath/ath6kl/bmi.h +++ b/drivers/net/wireless/ath/ath6kl/bmi.h @@ -242,7 +242,8 @@ struct ath6kl_bmi_target_info { (void) (check_type == val); \ addr = ath6kl_get_hi_item_addr(ar, HI_ITEM(item)); \ ret = ath6kl_bmi_read(ar, addr, (u8 *) &tmp, 4); \ - *val = le32_to_cpu(tmp); \ + if (!ret) \ + *val = le32_to_cpu(tmp); \ ret; \ }) |