Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/topic/s5m8767' into v3.9-rc8
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Apr 28, 2013
2 parents fbf6630 + 720a971 commit eea8e85
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/regulator/s5m8767.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit eea8e85

Please sign in to comment.