From: Christian Lamparter <chunkeey@googlemail.com>
Date: Wed, 16 Feb 2011 18:53:08 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw
X-Git-Tag: 1.9.3~7
X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=commitdiff_plain;h=bced9f962079f977b1e6d4e5f176bc9fb0dfc13f;hp=426e6ff2a4bb4ae1c19def78631e28a6cbcd845c

Merge branch 'master' of git://git./linux/kernel/git/chr/carl9170fw
---

diff --git a/tools/carlu/src/debug.c b/tools/carlu/src/debug.c
index 5721008..3da9e65 100644
--- 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, "   ");
 		}