These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / regulator / tps6586x-regulator.c

diff --git a/kernel/drivers/regulator/tps6586x-regulator.c b/kernel/drivers/regulator/tps6586x-regulator.c
index 2852de0..9e9d220 100644 (file)
--- a/kernel/drivers/regulator/tps6586x-regulator.c
+++ b/kernel/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;