Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

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

diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index 2852de05d64d5cb672d90c9a42a0d9ce20096edf..9e9d22038017a3b54ecdec3c10ad5f705f6ee777 100644 (file)
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -422,12 +422,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
                return NULL;
 
        for (i = 0; i < num; i++) {
-               int id;
+               uintptr_t id;
                if (!tps6586x_matches[i].init_data)
                        continue;
 
                pdata->reg_init_data[i] = tps6586x_matches[i].init_data;
-               id = (int)tps6586x_matches[i].driver_data;
+               id = (uintptr_t)tps6586x_matches[i].driver_data;
                if (id == TPS6586X_ID_SYS)
                        sys_rail = pdata->reg_init_data[i]->constraints.name;