diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:46 -0400 |
| commit | eea8e85e3b4c19cfa1028822adfd85842553d841 (patch) | |
| tree | 9d99235fb4f9e050ef5b7d6f951062e7d737d9d8 /drivers/regulator | |
| parent | fbf6630d707c0776dacbaee0c444fb4c61e4f939 (diff) | |
| parent | 720a9717bcdad6fbfa22cde082c47fb969a22f6f (diff) | |
Merge remote-tracking branch 'regulator/topic/s5m8767' into v3.9-rc8
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/s5m8767.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 2dd74e254397..c24448bc43cf 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c | |||
| @@ -549,7 +549,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, | |||
| 549 | 549 | ||
| 550 | rmode = devm_kzalloc(&pdev->dev, sizeof(*rmode) * | 550 | rmode = devm_kzalloc(&pdev->dev, sizeof(*rmode) * |
| 551 | pdata->num_regulators, GFP_KERNEL); | 551 | pdata->num_regulators, GFP_KERNEL); |
| 552 | if (!rdata) { | 552 | if (!rmode) { |
| 553 | dev_err(iodev->dev, | 553 | dev_err(iodev->dev, |
| 554 | "could not allocate memory for regulator mode\n"); | 554 | "could not allocate memory for regulator mode\n"); |
| 555 | return -ENOMEM; | 555 | return -ENOMEM; |