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

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

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

parents fbf6630d 720a9717
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,

	rmode = devm_kzalloc(&pdev->dev, sizeof(*rmode) *
				pdata->num_regulators, GFP_KERNEL);
	if (!rdata) {
	if (!rmode) {
		dev_err(iodev->dev,
			"could not allocate memory for regulator mode\n");
		return -ENOMEM;