Maarten ter Huurne authored Mar 17, 2016 and Mark Brown committed Mar 28, 2016

This makes the code easier to read and it avoids a dynamic memory
allocation.

Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Signed-off-by: Mark Brown <broonie@kernel.org>