summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-01 11:17:08 +0100
committerMark Brown <broonie@linaro.org>2013-07-01 11:17:08 +0100
commit39c9f80f43d754dadb2cd1adbc365840b5e99cca (patch)
tree786a8c9a70ffced6995f014df69a5a1b112803a0 /drivers/regulator
parentbf7b8113e30e4dc2f587558f491b1596da5b2dd9 (diff)
parent85bea1bf33f6e66221c5818332382f2ed9f2ad0e (diff)
Merge remote-tracking branch 'regulator/topic/isl6271a' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/isl6271a-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c
index d1e5bee2a26..b99c49b9aff 100644
--- a/drivers/regulator/isl6271a-regulator.c
+++ b/drivers/regulator/isl6271a-regulator.c
@@ -130,7 +130,7 @@ static int isl6271a_probe(struct i2c_client *i2c,
if (i == 0)
config.init_data = init_data;
else
- config.init_data = 0;
+ config.init_data = NULL;
config.driver_data = pmic;
pmic->rdev[i] = regulator_register(&isl_rd[i], &config);