Browse Source

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

Mark Brown 12 years ago
parent
commit
39c9f80f43
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/regulator/isl6271a-regulator.c

+ 1 - 1
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);