Merge "Revert "ASoc: msm: Improve error checking in code"" into msm-3.0