Merge branch 'x86/microcode' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

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

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 65a86bdeabedbdfdf35ff66f976cda00114a09a9..3f5677b7690e5c3f8332fde97fa3a62a82fe4a57 100644 (file)
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -274,9 +274,9 @@ static int imx_pwm_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       imx->mmio_base = devm_request_and_ioremap(&pdev->dev, r);
-       if (imx->mmio_base == NULL)
-               return -EADDRNOTAVAIL;
+       imx->mmio_base = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(imx->mmio_base))
+               return PTR_ERR(imx->mmio_base);
 
        data = of_id->data;
        imx->config = data->config;