diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-02-20 03:53:11 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-20 06:49:06 -0500 |
| commit | 4754b4211ddc9e6ebec97b0088a1c0ecb558f780 (patch) | |
| tree | 5cb8fe18784629e67a044653563c0efb9708d0d6 | |
| parent | 3471c1224cb5f543b617e2d14000db1fcf71924b (diff) | |
regulator: s5m8767: Remove redundant error message
kzalloc prints its own OOM message upon failure.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/regulator/s5m8767.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 6850a25a41c4..6884eb880dc9 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c | |||
| @@ -612,19 +612,13 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, | |||
| 612 | 612 | ||
| 613 | rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) * | 613 | rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) * |
| 614 | pdata->num_regulators, GFP_KERNEL); | 614 | pdata->num_regulators, GFP_KERNEL); |
| 615 | if (!rdata) { | 615 | if (!rdata) |
| 616 | dev_err(iodev->dev, | ||
| 617 | "could not allocate memory for regulator data\n"); | ||
| 618 | return -ENOMEM; | 616 | return -ENOMEM; |
| 619 | } | ||
| 620 | 617 | ||
| 621 | rmode = devm_kzalloc(&pdev->dev, sizeof(*rmode) * | 618 | rmode = devm_kzalloc(&pdev->dev, sizeof(*rmode) * |
| 622 | pdata->num_regulators, GFP_KERNEL); | 619 | pdata->num_regulators, GFP_KERNEL); |
| 623 | if (!rmode) { | 620 | if (!rmode) |
| 624 | dev_err(iodev->dev, | ||
| 625 | "could not allocate memory for regulator mode\n"); | ||
| 626 | return -ENOMEM; | 621 | return -ENOMEM; |
| 627 | } | ||
| 628 | 622 | ||
| 629 | pdata->regulators = rdata; | 623 | pdata->regulators = rdata; |
| 630 | pdata->opmode = rmode; | 624 | pdata->opmode = rmode; |
