Merge remote-tracking branch 'regulator/topic/isl6271a' into regulator-next
This commit is contained in:
commit
39c9f80f43
|
@ -130,7 +130,7 @@ static int isl6271a_probe(struct i2c_client *i2c,
|
||||||
if (i == 0)
|
if (i == 0)
|
||||||
config.init_data = init_data;
|
config.init_data = init_data;
|
||||||
else
|
else
|
||||||
config.init_data = 0;
|
config.init_data = NULL;
|
||||||
config.driver_data = pmic;
|
config.driver_data = pmic;
|
||||||
|
|
||||||
pmic->rdev[i] = regulator_register(&isl_rd[i], &config);
|
pmic->rdev[i] = regulator_register(&isl_rd[i], &config);
|
||||||
|
|
Loading…
Reference in a new issue