Merge "msm: vidc: Amend error handling"