Suppress -Wconditional-uninitialized warning

Init pointer variable to NULL to suppress
Wconditional-uninitialized warning.

Change-Id: I7f09bd24cfc00778084617dfaf2e3a262c561e66
Suppress -Wconditional-uninitialized warning

clang warned that 'count' was maybe used
uninitialised, because, I think, it didn't realize
that you can only get into the 'while' if you
previously got into the 'if'.  So just moved
the 'while' into the 'if'.

Change-Id: I1360e16c3af3186c8b0a65c4db1011c2d5f057a9
Merge topic 'Wconditional-uninitialized' into master

19931660 Suppress -Wconditional-uninitialized warning
9c896273 Suppress -Wconditional-uninitialized warning