Applied fix from: https://github.com/OpenSensation/android_kernel_htc_msm8660/commit/f77148cfdf8f5d8227e87e54dc82435c22b0e197

I basically just applied the same modifications progmanos identified