Merge "msm_otg: Fix forbidden compilation warning." into msm-3.0