summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Ryazanov <ryazanov.s.a@gmail.com>2016-08-02 14:19:28 +0300
committerKalle Valo <kvalo@codeaurora.org>2016-09-03 13:02:24 +0300
commitaf8a9a67c3466f70ab28a112d18eb5d327d40ca2 (patch)
tree0c651f3e6d4d3bb7ba932c10fa356eaca62a0772
parentbd6b0242652a8a284eed2adec5ac1fc043b8f2ef (diff)
downloadop-kernel-dev-af8a9a67c3466f70ab28a112d18eb5d327d40ca2.zip
op-kernel-dev-af8a9a67c3466f70ab28a112d18eb5d327d40ca2.tar.gz
ath5k: fix EEPROM dumping via debugfs
EEPROM size calculated in 16-bit words, so we should take into account this fact during buffer allocation. CC: Jiri Slaby <jirislaby@gmail.com> CC: Nick Kossifidis <mickflemm@gmail.com> CC: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/ath/ath5k/debug.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 929d7cc..4f8d9ed 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -909,7 +909,7 @@ static int open_file_eeprom(struct inode *inode, struct file *file)
struct ath5k_hw *ah = inode->i_private;
bool res;
int i, ret;
- u32 eesize;
+ u32 eesize; /* NB: in 16-bit words */
u16 val, *buf;
/* Get eeprom size */
@@ -932,7 +932,7 @@ static int open_file_eeprom(struct inode *inode, struct file *file)
/* Create buffer and read in eeprom */
- buf = vmalloc(eesize);
+ buf = vmalloc(eesize * 2);
if (!buf) {
ret = -ENOMEM;
goto err;
@@ -952,7 +952,7 @@ static int open_file_eeprom(struct inode *inode, struct file *file)
}
ep->buf = buf;
- ep->len = i;
+ ep->len = eesize * 2;
file->private_data = (void *)ep;
OpenPOWER on IntegriCloud