Merge "msm: mdss: fix ret value during error case"