summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath/ath5k
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2017-05-19 11:47:44 +0300
committerKalle Valo <kvalo@codeaurora.org>2017-05-19 11:47:44 +0300
commitfb53905cf2c3db6eb1ce37a37c5002456fa7ee20 (patch)
tree52c6f0bc2987803a10732a2acb772882d4189eb6 /drivers/net/wireless/ath/ath5k
parenta1ad7198202ff9a2436bd24437730e78d90c5271 (diff)
parentb01c9e327249e4995e5b5b6cebec14166db9c1e7 (diff)
downloadlinux-fb53905cf2c3db6eb1ce37a37c5002456fa7ee20.tar.gz
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.13. Major changes: ath10k * add initial SDIO support (still work in progress)
Diffstat (limited to 'drivers/net/wireless/ath/ath5k')
-rw-r--r--drivers/net/wireless/ath/ath5k/debug.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index d068df520e7a..bd7f6d7b199e 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -938,7 +938,10 @@ static int open_file_eeprom(struct inode *inode, struct file *file)
}
for (i = 0; i < eesize; ++i) {
- AR5K_EEPROM_READ(i, val);
+ if (!ath5k_hw_nvram_read(ah, i, &val)) {
+ ret = -EIO;
+ goto freebuf;
+ }
buf[i] = val;
}