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

Commit a6a671e1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/ab3100' and... 

Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11' into regulator-linus
parents 00e67470 23e21ddf 54820f58

drivers/regulator/ab3100.c

+2 −2
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int ab3100_regulator_register(struct platform_device *pdev, 
				     struct ab3100_platform_data *plfdata,

				     struct regulator_init_data *init_data,

				     struct device_node *np,

				     int id)

				     unsigned long id)

{

	struct regulator_desc *desc;

	struct ab3100_regulator *reg;
@@ -646,7 +646,7 @@ ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np) 
		err = ab3100_regulator_register(

			pdev, NULL, ab3100_regulator_matches[i].init_data,

			ab3100_regulator_matches[i].of_node,

			(int) ab3100_regulator_matches[i].driver_data);

			(unsigned long)ab3100_regulator_matches[i].driver_data);

		if (err) {

			ab3100_regulators_remove(pdev);

			return err;

drivers/regulator/s2mps11.c

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ common_reg: 
	for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {

		if (!reg_np) {

			config.init_data = pdata->regulators[i].initdata;

			config.of_node = pdata->regulators[i].reg_node;

		} else {

			config.init_data = rdata[i].init_data;

			config.of_node = rdata[i].of_node;