diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-31 15:51:38 +0800 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-10-31 12:38:34 +0100 |
| commit | cd5d58108e41b0edecc1e7a6468cbe06ce03be3f (patch) | |
| tree | 21988da79ab768dc1559be63820cb18e41d19f35 /arch/mips/ralink/timer.c | |
| parent | 13b7ea6377fb23f02784a38e894f8fad49816376 (diff) | |
| download | blackbird-op-linux-cd5d58108e41b0edecc1e7a6468cbe06ce03be3f.tar.gz blackbird-op-linux-cd5d58108e41b0edecc1e7a6468cbe06ce03be3f.zip | |
MIPS: ralink: fix return value check in rt_timer_probe()
In case of error, the function devm_request_and_ioremap() returns NULL
pointer not ERR_PTR(). Fix it by using devm_ioremap_resource() instead
of devm_request_and_ioremap().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: John Crispin <blogic@openwrt.org>
Cc: grant.likely@linaro.org
Cc: rob.herring@calxeda.com
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6098/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/ralink/timer.c')
| -rw-r--r-- | arch/mips/ralink/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c index e49241a2c39a..202785709441 100644 --- a/arch/mips/ralink/timer.c +++ b/arch/mips/ralink/timer.c @@ -126,7 +126,7 @@ static int rt_timer_probe(struct platform_device *pdev) return -ENOENT; } - rt->membase = devm_request_and_ioremap(&pdev->dev, res); + rt->membase = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(rt->membase)) return PTR_ERR(rt->membase); |
