regulator: core: if voltage scaling fails, restore original voltage values

Change-Id: I6f41096966aa5e5f9d834049ca9b2ae2d8156285
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Tested-by: Robert Nelson <robertcnelson@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Git-commit: 92d7a55879c01b30349045501108e775655a4b92
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[keliu@codeaurora.org: resolve merge conflicts]
Signed-off-by: Ke Liu <keliu@codeaurora.org>

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Revert "force fast charge"

This reverts commit f5104e5d3e24bb58feaec0f855912309cf0a0d36.
Force fastcharge
fix force fastcharge (tbalden: https://github.com/tbalden/android_kernel_htc_m7-sense4.2/commit/c89fa5989ae91c5b1962d3a85667b2388c1a1092)

Conflicts:
	arch/arm/mach-msm/htc_battery_8960.c
fastcharge options
add ffc to defconfig