Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / max8973-regulator.c

diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
index 89e53e0493997b05727f61b5618bcda8733cda60..6f2bdad8b4d8fd6ce2e552d4c44c8cf4a3ee60ba 100644 (file)
--- a/drivers/regulator/max8973-regulator.c
+++ b/drivers/regulator/max8973-regulator.c
@@ -312,7 +312,7 @@ static int max8973_init_dcdc(struct max8973_chip *max,
                max->desc.ramp_delay = 12000;
                break;
        case MAX8973_RAMP_25mV_PER_US:
-               max->desc.ramp_delay = 252000;
+               max->desc.ramp_delay = 25000;
                break;
        case MAX8973_RAMP_50mV_PER_US:
                max->desc.ramp_delay = 50000;