diff options
| author | Kalle Valo | 2017-05-19 10:47:44 +0200 |
|---|---|---|
| committer | Kalle Valo | 2017-05-19 10:47:44 +0200 |
| commit | fb53905cf2c3db6eb1ce37a37c5002456fa7ee20 (patch) | |
| tree | 52c6f0bc2987803a10732a2acb772882d4189eb6 /drivers/net/wireless/ath/ath5k | |
| parent | mwifiex: add missing USB-descriptor endianness conversion (diff) | |
| parent | ath9k: check ah->curchan when updating tx power (diff) | |
| download | kernel-qcow2-linux-fb53905cf2c3db6eb1ce37a37c5002456fa7ee20.tar.gz kernel-qcow2-linux-fb53905cf2c3db6eb1ce37a37c5002456fa7ee20.tar.xz kernel-qcow2-linux-fb53905cf2c3db6eb1ce37a37c5002456fa7ee20.zip | |
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.c | 5 |
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; } |