Merge "ASOC: msm: Add error check for I2S changes." into msm-3.0