diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-07-19 11:21:56 +0000 |
|---|---|---|
| committer |   Wim Van Sebroeck <wim@iguana.be> | 2016-07-25 12:02:43 +0200 |
| commit | cddd74db8d42b953a0612810f07c99e73deab185 (patch) | |
| tree | 8e3e74691aa5ae55351cb63af53c221a6f9c2c4b /drivers/watchdog | |
| parent | watchdog: pic32-dmt: Remove .owner field for driver (diff) | |
| download | linux-dev-cddd74db8d42b953a0612810f07c99e73deab185.tar.xz linux-dev-cddd74db8d42b953a0612810f07c99e73deab185.zip | |
watchdog: pic32-wdt: Fix return value check in pic32_wdt_drv_probe()
In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/pic32-wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/pic32-wdt.c b/drivers/watchdog/pic32-wdt.c index 18174fef5113..e2761068dc6f 100644 --- a/drivers/watchdog/pic32-wdt.c +++ b/drivers/watchdog/pic32-wdt.c @@ -183,8 +183,8 @@ static int pic32_wdt_drv_probe(struct platform_device *pdev) return PTR_ERR(wdt->regs); wdt->rst_base = devm_ioremap(&pdev->dev, PIC32_BASE_RESET, 0x10); - if (IS_ERR(wdt->rst_base)) - return PTR_ERR(wdt->rst_base); + if (!wdt->rst_base) + return -ENOMEM; wdt->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(wdt->clk)) { |