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

Commit 9eaec296 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/max8997' into v3.9-rc8

parents 8ca5e1fa a2f07305

drivers/regulator/max8997.c

+2 −2
Original line number Diff line number Diff line
@@ -1035,8 +1035,8 @@ static int max8997_pmic_probe(struct platform_device *pdev) 
	int i, ret, size, nr_dvs;

	u8 max_buck1 = 0, max_buck2 = 0, max_buck5 = 0;



	if (IS_ERR_OR_NULL(pdata)) {

		dev_err(pdev->dev.parent, "No platform init data supplied.\n");

	if (!pdata) {

		dev_err(&pdev->dev, "No platform init data supplied.\n");

		return -ENODEV;

	}