Merge remote-tracking branch 'regulator/topic/isl6271a' into regulato…

…r-next
git-mirror · Jul 1, 2013 · 39c9f80 · 39c9f80
2 parents bf7b811 + 85bea1b
commit 39c9f80
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);