Fix bugs pointed out by checkpatch: Mis-coding of two if statements
caused early return from function.

Number of tests completed increased from 102 to 107.
Number of tests failed increased from 0 to 2.
Signed-off-by: NFrank Rowand <frank.rowand@sonymobile.com>
Signed-off-by: NGrant Likely <grant.likely@linaro.org>