From 1842b75b2d4689d08b8892b6e14da17b28ee0dfb Mon Sep 17 00:00:00 2001 From: Reinette Chatre Date: Fri, 25 Sep 2009 14:24:21 -0700 Subject: [PATCH] --- yaml --- r: 166567 b: refs/heads/master c: 2fac9717a05fc4b4824422d2c439c1260807c110 h: refs/heads/master i: 166565: 7a2365aaa98608349180d3a305b7e3bff735adb1 166563: 28d4fefe7e031a7d61c7691b66ec890268005cdb 166559: b612343e5968ce78b895833b84c698cd0fe5e2cc v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4af8a56d052c..b8d3db055481 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4be3bd8ccc195297870b9ffca4ef18bcbc2f1822 +refs/heads/master: 2fac9717a05fc4b4824422d2c439c1260807c110 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c index fb844859a443..8c374bf043d0 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-debugfs.c @@ -410,7 +410,7 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, 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 += strlen(buf + pos); if (buf_size - pos > 0) buf[pos++] = '\n'; } @@ -909,7 +909,7 @@ static ssize_t iwl_dbgfs_traffic_log_read(struct file *file, "0x%.4x ", ofs); hex_dump_to_buffer(ptr + ofs, 16, 16, 2, buf + pos, bufsz - pos, 0); - pos += strlen(buf); + pos += strlen(buf + pos); if (bufsz - pos > 0) buf[pos++] = '\n'; } @@ -932,7 +932,7 @@ static ssize_t iwl_dbgfs_traffic_log_read(struct file *file, "0x%.4x ", ofs); hex_dump_to_buffer(ptr + ofs, 16, 16, 2, buf + pos, bufsz - pos, 0); - pos += strlen(buf); + pos += strlen(buf + pos); if (bufsz - pos > 0) buf[pos++] = '\n'; }