| commit | 39c9f80f43d754dadb2cd1adbc365840b5e99cca | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Mon Jul 01 11:17:08 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Mon Jul 01 11:17:08 2013 +0100 |
| tree | 786a8c9a70ffced6995f014df69a5a1b112803a0 | |
| parent | bf7b8113e30e4dc2f587558f491b1596da5b2dd9 [diff] | |
| parent | 85bea1bf33f6e66221c5818332382f2ed9f2ad0e [diff] |
Merge remote-tracking branch 'regulator/topic/isl6271a' into regulator-next
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c index d1e5bee..b99c49b 100644 --- a/drivers/regulator/isl6271a-regulator.c +++ b/drivers/regulator/isl6271a-regulator.c
@@ -130,7 +130,7 @@ 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);