sound/soc: Fix mismerges

Signed-off-by: Robert Rozic <r.rozic97@gmail.com>