Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / regulator / tps6524x-regulator.c

diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 843ee0a9bb92ce2a23e7a2209590b99cfa13e76c..1094393155ed17927e3cafd9170cdaf1fb0bb602 100644 (file)
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -572,6 +572,7 @@ static struct regulator_ops regulator_ops = {
        .get_voltage_sel        = get_voltage_sel,
        .set_voltage_sel        = set_voltage_sel,
        .list_voltage           = regulator_list_voltage_table,
+       .map_voltage            = regulator_map_voltage_ascend,
        .set_current_limit      = set_current_limit,
        .get_current_limit      = get_current_limit,
 };
@@ -584,8 +585,7 @@ static int pmic_remove(struct spi_device *spi)
        if (!hw)
                return 0;
        for (i = 0; i < N_REGULATORS; i++) {
-               if (hw->rdev[i])
-                       regulator_unregister(hw->rdev[i]);
+               regulator_unregister(hw->rdev[i]);
                hw->rdev[i] = NULL;
        }
        spi_set_drvdata(spi, NULL);