Commit eea8e85e authored by Mark Brown's avatar Mark Brown

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

parents fbf6630d 720a9717
...@@ -549,7 +549,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, ...@@ -549,7 +549,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
rmode = devm_kzalloc(&pdev->dev, sizeof(*rmode) * rmode = devm_kzalloc(&pdev->dev, sizeof(*rmode) *
pdata->num_regulators, GFP_KERNEL); pdata->num_regulators, GFP_KERNEL);
if (!rdata) { if (!rmode) {
dev_err(iodev->dev, dev_err(iodev->dev,
"could not allocate memory for regulator mode\n"); "could not allocate memory for regulator mode\n");
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment