Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

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

diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index 3003e2a9580b207780cb13af945f45fdd0caeac0..2f3cc8fb471af041ffc82039b98c461f52d38c3b 100644 (file)
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -285,11 +285,9 @@ static int ar7_wdt_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       ar7_wdt = devm_request_and_ioremap(&pdev->dev, ar7_regs_wdt);
-       if (!ar7_wdt) {
-               pr_err("could not ioremap registers\n");
-               return -ENXIO;
-       }
+       ar7_wdt = devm_ioremap_resource(&pdev->dev, ar7_regs_wdt);
+       if (IS_ERR(ar7_wdt))
+               return PTR_ERR(ar7_wdt);
 
        vbus_clk = clk_get(NULL, "vbus");
        if (IS_ERR(vbus_clk)) {