summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 14:40:29 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 14:40:29 +0100
commitf5164b8833498825b3197cb34150b142a9fc5bbf (patch)
tree0f4586bc6419cbcd3a469dfe77abe8c102924689 /drivers/regulator
parentaaa9b649d0868725cd7536bc9017fe3956ad5393 (diff)
parenta70f0d027c83350ad46ca3e86e4c781bfed7fcc2 (diff)
downloadlinux-f5164b8833498825b3197cb34150b142a9fc5bbf.tar.gz
linux-f5164b8833498825b3197cb34150b142a9fc5bbf.tar.bz2
linux-f5164b8833498825b3197cb34150b142a9fc5bbf.zip
Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps6586x-regulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index 2852de05d64d..9e9d22038017 100644
--- 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;