diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-27 16:22:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-27 16:22:20 +1000 |
| commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e (patch) | |
| tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 /drivers/pwm/pwm-tiehrpwm.c | |
| parent | 6f314ebbaa2667d67a7206ba78f28e46cf47eda5 (diff) | |
| parent | c182ae42cc3611f7b3fa803c0bcab6e5d29bea63 (diff) | |
| download | blackbird-op-linux-93bb70e0c00f1be4cc857e4d8375c44058cce71e.tar.gz blackbird-op-linux-93bb70e0c00f1be4cc857e4d8375c44058cce71e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
Diffstat (limited to 'drivers/pwm/pwm-tiehrpwm.c')
| -rw-r--r-- | drivers/pwm/pwm-tiehrpwm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c index 010d232cb0c8..c3756d1be194 100644 --- a/drivers/pwm/pwm-tiehrpwm.c +++ b/drivers/pwm/pwm-tiehrpwm.c @@ -371,10 +371,8 @@ static int __devinit ehrpwm_pwm_probe(struct platform_device *pdev) } pc->mmio_base = devm_request_and_ioremap(&pdev->dev, r); - if (!pc->mmio_base) { - dev_err(&pdev->dev, "failed to ioremap() registers\n"); + if (!pc->mmio_base) return -EADDRNOTAVAIL; - } ret = pwmchip_add(&pc->chip); if (ret < 0) { |
