Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 f5164b88 编写于 作者: M Mark Brown
浏览文件
操作

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

上级 aaa9b649 a70f0d02
隐藏空白更改
内联 并排
Showing with 2 addition and 2 deletion
drivers/regulator/tps6586x-regulator.c
浏览文件 @ f5164b88
...@@ -422,12 +422,12 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt( ...@@ -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;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或