Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[~andy/linux] / drivers / pwm / pwm-vt8500.c

diff --git a/drivers/pwm/pwm-vt8500.c b/drivers/pwm/pwm-vt8500.c
index b0ba2d403439b0a77b889f88cb210f0eaae789ad..f9de9b28e46e04121a8e7d42b36f6f613b11a228 100644 (file)
--- a/drivers/pwm/pwm-vt8500.c
+++ b/drivers/pwm/pwm-vt8500.c
@@ -178,9 +178,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) {