Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[firefly-linux-kernel-4.4.55.git] / drivers / pwm / pwm-vt8500.c

diff --git a/drivers/pwm/pwm-vt8500.c b/drivers/pwm/pwm-vt8500.c
index 98d79e9f0144d6a443e80296f089bc86acd1a905..69effd19afc700144ad35ab4fce44ccf991f8dae 100644 (file)
--- a/drivers/pwm/pwm-vt8500.c
+++ b/drivers/pwm/pwm-vt8500.c
@@ -235,9 +235,9 @@ static int vt8500_pwm_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       chip->base = devm_request_and_ioremap(&pdev->dev, r);
-       if (!chip->base)
-               return -EADDRNOTAVAIL;
+       chip->base = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(chip->base))
+               return PTR_ERR(chip->base);
 
        ret = clk_prepare(chip->clk);
        if (ret < 0) {