diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-06-02 19:20:17 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-06-02 19:20:17 +0400 |
| commit | fcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0 (patch) | |
| tree | a17982638b066ae29f8ab1a6e37f18e6dddb5272 /drivers/net/wireless/ath/ath10k/bmi.h | |
| parent | 96b2e73c5471542cb9c622c4360716684f8797ed (diff) | |
| parent | a715c7ddd65a1a3b2839b8ebd759bb2d361f7675 (diff) | |
| download | linux-fcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/bmi.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/bmi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h index 3a9bdf51c96a..111ab701465c 100644 --- a/drivers/net/wireless/ath/ath10k/bmi.h +++ b/drivers/net/wireless/ath/ath10k/bmi.h @@ -201,7 +201,8 @@ int ath10k_bmi_write_memory(struct ath10k *ar, u32 address, \ addr = host_interest_item_address(HI_ITEM(item)); \ ret = ath10k_bmi_read_memory(ar, addr, (u8 *)&tmp, 4); \ - *val = __le32_to_cpu(tmp); \ + if (!ret) \ + *val = __le32_to_cpu(tmp); \ ret; \ }) |