msm_thermal: fix up from cherry-pick