summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-10-31 15:50:55 +0800
committerWim Van Sebroeck <wim@iguana.be>2013-11-17 19:38:44 +0100
commit0859ffc3b3cb673ac1d3f33b0265cf60d1e3836d (patch)
tree25aabd56b0355cd4494ae33a27d09a1b663f05c8 /drivers/watchdog
parent6ffcff931971ce78d08220a7a3bbaddaea207598 (diff)
downloadop-kernel-dev-0859ffc3b3cb673ac1d3f33b0265cf60d1e3836d.zip
op-kernel-dev-0859ffc3b3cb673ac1d3f33b0265cf60d1e3836d.tar.gz
watchdog: rt2880_wdt: fix return value check in rt288x_wdt_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> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/rt2880_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c
index a9f8491..53d37fe 100644
--- a/drivers/watchdog/rt2880_wdt.c
+++ b/drivers/watchdog/rt2880_wdt.c
@@ -144,7 +144,7 @@ static int rt288x_wdt_probe(struct platform_device *pdev)
int ret;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- rt288x_wdt_base = devm_request_and_ioremap(&pdev->dev, res);
+ rt288x_wdt_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(rt288x_wdt_base))
return PTR_ERR(rt288x_wdt_base);
OpenPOWER on IntegriCloud