Merge branch 'pm-cpufreq'

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

diff --git a/drivers/pwm/pwm-lpc32xx.c b/drivers/pwm/pwm-lpc32xx.c
index 14106440294fa94fd468563f4bed1212d6f356fe..b3f0d0dfd74808ff9469f72a0f371bca7ebd85be 100644 (file)
--- a/drivers/pwm/pwm-lpc32xx.c
+++ b/drivers/pwm/pwm-lpc32xx.c
@@ -110,9 +110,9 @@ static int lpc32xx_pwm_probe(struct platform_device *pdev)
        if (!res)
                return -EINVAL;
 
-       lpc32xx->base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!lpc32xx->base)
-               return -EADDRNOTAVAIL;
+       lpc32xx->base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(lpc32xx->base))
+               return PTR_ERR(lpc32xx->base);
 
        lpc32xx->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(lpc32xx->clk))