Also improve the error reporting on failure and remove a duplicate put.
This provides a small code saving.
Signed-off-by: NMark Brown <broonie@linaro.org>