diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-13 04:22:16 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-13 04:22:16 +0900 |
| commit | 63bab2203d54529ff1a7181b0575b58a9f3575cd (patch) | |
| tree | 7fe7ba34fd2cb5a3d9739806f6a0fc9924797e9b | |
| parent | 08d27eb2066622cd659b91d877d0406ebd651225 (diff) | |
| parent | 43160ffd12c8d1d331362362eea3c70e04b6f9c4 (diff) | |
| download | linux-xen-63bab2203d54529ff1a7181b0575b58a9f3575cd.tar.gz | |
Merge tag 'qcom-smd-list-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown:
"Fix qcom-smd list voltage issues for msm8974
This commit looks like a cleanup but in fact by causing the core to go
down some simplified code paths for noop regulators it avoids a boot
time crash for msm8974 platforms which was introduced in v4.7. It has
been in -next for a while, the issues in mainline for these platforms
weren't flagged up to me until yesterday (I think it took some time to
figure out what was going wrong)"
* tag 'qcom-smd-list-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: qcom_smd: Remove list_voltage callback for rpm_smps_ldo_ops_fixed
| -rw-r--r-- | drivers/regulator/qcom_smd-regulator.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c index 526bf23dcb49a..6c7fe47787937 100644 --- a/drivers/regulator/qcom_smd-regulator.c +++ b/drivers/regulator/qcom_smd-regulator.c @@ -152,7 +152,6 @@ static const struct regulator_ops rpm_smps_ldo_ops_fixed = { .enable = rpm_reg_enable, .disable = rpm_reg_disable, .is_enabled = rpm_reg_is_enabled, - .list_voltage = regulator_list_voltage_linear_range, .get_voltage = rpm_reg_get_voltage, .set_voltage = rpm_reg_set_voltage, |