diff options
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 7b433f3bddca..a0daa2fb5de6 100644 --- 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) | |||
808 | return -ENOMEM; | 808 | return -ENOMEM; |
809 | } | 809 | } |
810 | 810 | ||
811 | timer->io_base = devm_request_and_ioremap(dev, mem); | 811 | timer->io_base = devm_ioremap_resource(dev, mem); |
812 | if (!timer->io_base) { | 812 | if (IS_ERR(timer->io_base)) |
813 | dev_err(dev, "%s: region already claimed.\n", __func__); | 813 | return PTR_ERR(timer->io_base); |
814 | return -ENOMEM; | ||
815 | } | ||
816 | 814 | ||
817 | if (dev->of_node) { | 815 | if (dev->of_node) { |
818 | if (of_find_property(dev->of_node, "ti,timer-alwon", NULL)) | 816 | if (of_find_property(dev->of_node, "ti,timer-alwon", NULL)) |