Merge "platform: msm_shared: correct the type of return value"