]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
watchdog: pic32-wdt: Fix return value check in pic32_wdt_drv_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 19 Jul 2016 11:21:56 +0000 (11:21 +0000)
committerWim Van Sebroeck <wim@iguana.be>
Mon, 25 Jul 2016 10:02:43 +0000 (12:02 +0200)
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>
drivers/watchdog/pic32-wdt.c

index 18174fef51136aa674de0619e94afed4b8b8d305..e2761068dc6f9c07dbdbbb4df17ebc3fe6442ee2 100644 (file)
@@ -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)) {