powerpc/gamecube/wii: Fix off-by-one error in ugecon/usbgecko_udbg

The retry logic in ug_putc() is broken. If the TX fifo is not ready and the counter runs out it will have a value of -1 and no transfer should be attempted. Also, a counter with a value of 0 means that the TX fifo got ready in the last try and the transfer should be attempted. Reported-by: "Juha Leppanen" <juha_motorsportcom@luukku.com> Signed-off-by: "Juha Leppanen" <juha_motorsportcom@luukku.com> Signed-off-by: Albert Herranz <albert_herranz@yahoo.es> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

powerpc/gamecube/wii: Fix off-by-one error in ugecon/usbgecko_udbg
The retry logic in ug_putc() is broken. If the TX fifo is not ready and the counter runs out it will have a value of -1 and no transfer should be attempted. Also, a counter with a value of 0 means that the TX fifo got ready in the last try and the transfer should be attempted. Reported-by: "Juha Leppanen" <juha_motorsportcom@luukku.com> Signed-off-by: "Juha Leppanen" <juha_motorsportcom@luukku.com> Signed-off-by: Albert Herranz <albert_herranz@yahoo.es> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Albert Herranz · Benjamin Herrenschmidt
1 parent 38e1313fc7
Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff
arch/powerpc/boot/ugecon.c
arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c
@@ -86,7 +86,7 @@
  
 	while (!ug_is_txfifo_ready() && count--)
 		barrier();
-	if (count)
+	if (count >= 0)
 		ug_raw_putc(ch);
 }
  
@@ -120,7 +120,7 @@
  
 	while (!ug_is_txfifo_ready() && count--)
 		barrier();
-	if (count)
+	if (count >= 0)
 		ug_raw_putc(ch);
 }
...	...	@@ -86,7 +86,7 @@
86	86
87	87	while (!ug_is_txfifo_ready() && count--)
88	88	barrier();
89		- if (count)
	89	+ if (count >= 0)
90	90	ug_raw_putc(ch);
91	91	}
92	92
...	...	@@ -120,7 +120,7 @@
120	120
121	121	while (!ug_is_txfifo_ready() && count--)
122	122	barrier();
123		- if (count)
	123	+ if (count >= 0)
124	124	ug_raw_putc(ch);
125	125	}
126	126