Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw

diff --git a/tools/carlu/src/debug.c b/tools/carlu/src/debug.c
index 5721008cef052c8acdca545f9ee401fd663acfae..3da9e651d3454cbfd1019965614f5b049dd01685 100644 (file)
--- a/tools/carlu/src/debug.c
+++ b/tools/carlu/src/debug.c
@@ -73,7 +73,7 @@ void print_hex_dump_bytes(const enum debug_level_t lvl, const char *pre,
        char str[17] = { 0 };
        const unsigned char *tmp = (void *) buf;
        char *pbuf = line;
-       size_t i;
+       size_t i, j;
 
        for (i = 0; i < len; i++) {
                if (i % 16 == 0) {
@@ -92,7 +92,7 @@ void print_hex_dump_bytes(const enum debug_level_t lvl, const char *pre,
                if ((i % 16)) {
                        str[i % 16] = '\0';
 
-                       for (i = 0; i < (16 - (i % 16)); i++)
+                       for (j = 0; j < (16 - (i % 16)); j++)
                                pbuf += sprintf(pbuf, "   ");
                }