This is more idiomatic and fixes bugs in the error handling paths.
Signed-off-by: NMark Brown <broonie@linaro.org>