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

39c9f80f · Mark Brown · bf7b8113 · 85bea1bf · 39c9f80f
Commit 39c9f80f authored Jul 01, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/isl6271a-regulator.c drivers/regulator/isl6271a-regulator.c +1 -1

No files found.
--- 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);