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>

The core files of DSS2. DSS2 commits are split a bit artificially to
make the individual commits smaller, and DSS2 doesn't compile properly
without the rest of the core commits. This shouldn't be a problem, as no
configuration uses DSS2 yet.
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@nokia.com>