These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wireless / iwlegacy / debug.c

diff --git a/kernel/drivers/net/wireless/iwlegacy/debug.c b/kernel/drivers/net/wireless/iwlegacy/debug.c
index 3440101..908b9f4 100644 (file)
--- a/kernel/drivers/net/wireless/iwlegacy/debug.c
+++ b/kernel/drivers/net/wireless/iwlegacy/debug.c
@@ -515,12 +515,8 @@ il_dbgfs_nvm_read(struct file *file, char __user *user_buf, size_t count,
            scnprintf(buf + pos, buf_size - pos, "EEPROM " "version: 0x%x\n",
                      eeprom_ver);
        for (ofs = 0; ofs < eeprom_len; ofs += 16) {
-               pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
-               hex_dump_to_buffer(ptr + ofs, 16, 16, 2, buf + pos,
-                                  buf_size - pos, 0);
-               pos += strlen(buf + pos);
-               if (buf_size - pos > 0)
-                       buf[pos++] = '\n';
+               pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x %16ph\n",
+                                ofs, ptr + ofs);
        }
 
        ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);