fixes from upstream msm8960.c