redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next

Browse source
This commit is contained in:
Mark Brown 2015-08-30 14:40:29 +01:00
parent aaa9b649d0 a70f0d027c
commit f5164b8833
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/regulator/tps6586x-regulator.c
View file

@ -422,12 +422,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
return NULL; return NULL;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
int id; uintptr_t id;
if (!tps6586x_matches[i].init_data) if (!tps6586x_matches[i].init_data)
continue; continue;
pdata->reg_init_data[i] = tps6586x_matches[i].init_data; 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) if (id == TPS6586X_ID_SYS)
sys_rail = pdata->reg_init_data[i]->constraints.name; sys_rail = pdata->reg_init_data[i]->constraints.name;