Merge "msm: msm_bus: Add checks to avoid Klocwork errors"