Merge changes Ib1f49cea,I4c14d8e6 into msm-3.0

* changes:
  thermal: msm8960_tsens: Fix string length
  hwmon: pm8xxx-adc: Fix error handling conditions