Merge "ASoC: msm: qdsp6v2: deliver correct return value"