Merge commit '7185684' into omap-for-v3.10/timer

[karo-tx-linux.git] / arch / arm / plat-omap / dmtimer.c

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 5679ec41928b34d78d9d63d42b18bfeecbe5df99..e6dbc8dbe6a68457acf5515a238551f61fc65e78 100644 (file)
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -808,11 +808,9 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
        }
 
        timer->fclk = ERR_PTR(-ENODEV);
-       timer->io_base = devm_request_and_ioremap(dev, mem);
-       if (!timer->io_base) {
-               dev_err(dev, "%s: region already claimed.\n", __func__);
-               return -ENOMEM;
-       }
+       timer->io_base = devm_ioremap_resource(dev, mem);
+       if (IS_ERR(timer->io_base))
+               return PTR_ERR(timer->io_base);
 
        if (dev->of_node) {
                if (of_find_property(dev->of_node, "ti,timer-alwon", NULL))