Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / drivers / watchdog / dw_wdt.c

diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index a0eba3c40e250a5431c0a7c8bfa4aade72aecc33..20376698938252e789e5839ce70e5839dd5d5d22 100644 (file)
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -301,9 +301,9 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
        if (!mem)
                return -EINVAL;
 
-       dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem);
-       if (!dw_wdt.regs)
-               return -ENOMEM;
+       dw_wdt.regs = devm_ioremap_resource(&pdev->dev, mem);
+       if (IS_ERR(dw_wdt.regs))
+               return PTR_ERR(dw_wdt.regs);
 
        dw_wdt.clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(dw_wdt.clk))