diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-11 00:43:46 +0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-11 00:43:46 +0400 |
| commit | e8e6e6012d68c4967e8f26fdd39ac95c247d4789 (patch) | |
| tree | 6b88dfc219ad811a564e81e9c2219dd5cd1b0fa4 /drivers/regulator/wm831x-dcdc.c | |
| parent | bc079e8b1684e1de505ec06f8c2339ae60a329e8 (diff) | |
| parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
| download | linux-e8e6e6012d68c4967e8f26fdd39ac95c247d4789.tar.xz | |
Merge tag 'v3.14-rc6' into drm-intel-next-queued
Linux 3.14-rc6
I need the hdmi/dvi-dual link fixes in 3.14 to avoid ugly conflicts
when merging Ville's new hdmi cloning support into my -next tree
Conflicts:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/intel_dp.c
Makefile cleanup conflicts with an acpi build fix, intel_dp.c is
trivial.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/regulator/wm831x-dcdc.c')
| -rw-r--r-- | drivers/regulator/wm831x-dcdc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c index 6823e6f2b88a..04cf9c16ef23 100644 --- a/drivers/regulator/wm831x-dcdc.c +++ b/drivers/regulator/wm831x-dcdc.c @@ -762,8 +762,7 @@ static int wm831x_boostp_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_REG, 0); if (res == NULL) { dev_err(&pdev->dev, "No REG resource\n"); - ret = -EINVAL; - goto err; + return -EINVAL; } dcdc->base = res->start; @@ -788,7 +787,7 @@ static int wm831x_boostp_probe(struct platform_device *pdev) ret = PTR_ERR(dcdc->regulator); dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n", id + 1, ret); - goto err; + return ret; } irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")); @@ -799,15 +798,12 @@ static int wm831x_boostp_probe(struct platform_device *pdev) if (ret != 0) { dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n", irq, ret); - goto err; + return ret; } platform_set_drvdata(pdev, dcdc); return 0; - -err: - return ret; } static struct platform_driver wm831x_boostp_driver = { |