Loops checking for certain condition were rather inconsistent.
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@nokia.com>
Reported-by: NJuha Leppanen <juha_motorsportcom@luukku.com>