This patch fixes multiple bugs and a typo, occurred during the multi-
component transition.
Signed-off-by: NGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>