Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39c9f80f authored by Mark Brown's avatar Mark Brown
Browse files

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

parents bf7b8113 85bea1bf

drivers/regulator/isl6271a-regulator.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -130,7 +130,7 @@ static int isl6271a_probe(struct i2c_client *i2c, 
		if (i == 0)

		if (i == 0)

			config.init_data = init_data;

			config.init_data = init_data;

		else

		else

			config.init_data = 0;

			config.init_data = NULL;

		config.driver_data = pmic;

		config.driver_data = pmic;





		pmic->rdev[i] = regulator_register(&isl_rd[i], &config);

		pmic->rdev[i] = regulator_register(&isl_rd[i], &config);