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

Commit 5c306c8a authored by Mark Brown's avatar Mark Brown
Browse files

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

Merge remote-tracking branches 'regulator/fix/da9055' and 'regulator/fix/max14577' into regulator-linus
parents b28a960c f17083c3 667a6b7a

drivers/regulator/da9055-regulator.c

+3 −1
Original line number Diff line number Diff line
@@ -576,7 +576,9 @@ static int da9055_regulator_probe(struct platform_device *pdev) 
	/* Only LDO 5 and 6 has got the over current interrupt */

	if (pdev->id == DA9055_ID_LDO5 || pdev->id ==  DA9055_ID_LDO6) {

		irq = platform_get_irq_byname(pdev, "REGULATOR");

		irq = regmap_irq_get_virq(da9055->irq_data, irq);

		if (irq < 0)

			return irq;



		ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

						da9055_ldo5_6_oc_irq,

						IRQF_TRIGGER_HIGH |

drivers/regulator/max14577.c

+3 −2
Original line number Diff line number Diff line
@@ -168,10 +168,11 @@ static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev) 
			MAX14577_REG_MAX);

	if (ret < 0) {

		dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", ret);

		return ret;

	}



	return 0;

	of_node_put(np);



	return ret;

}



static inline struct regulator_init_data *match_init_data(int index)