diff options
Diffstat (limited to 'arch/arm/plat-omap/dmtimer.c')
| -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 7b433f3bddc..a0daa2fb5de 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)  		return  -ENOMEM;  	} -	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))  |