summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-06-17 17:12:05 +0000
committerWim Van Sebroeck <wim@iguana.be>2016-07-17 21:01:49 +0200
commitfafdbabaf5c6a949168b384e159152f6e37427ba (patch)
tree4cea5ef10ea110d9939bceb596ccf119e66c7ec4 /drivers/watchdog
parentdb6d2d0e6d24176f524359bff2f209f0c8425496 (diff)
downloadop-kernel-dev-fafdbabaf5c6a949168b384e159152f6e37427ba.zip
op-kernel-dev-fafdbabaf5c6a949168b384e159152f6e37427ba.tar.gz
watchdog: pic32-dmt: Fix return value check in pic32_dmt_probe()
In case of error, the function devm_kzalloc() 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-dmt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/pic32-dmt.c b/drivers/watchdog/pic32-dmt.c
index 962f58c..5e8890e 100644
--- a/drivers/watchdog/pic32-dmt.c
+++ b/drivers/watchdog/pic32-dmt.c
@@ -176,8 +176,8 @@ static int pic32_dmt_probe(struct platform_device *pdev)
struct watchdog_device *wdd = &pic32_dmt_wdd;
dmt = devm_kzalloc(&pdev->dev, sizeof(*dmt), GFP_KERNEL);
- if (IS_ERR(dmt))
- return PTR_ERR(dmt);
+ if (!dmt)
+ return -ENOMEM;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dmt->regs = devm_ioremap_resource(&pdev->dev, mem);
OpenPOWER on IntegriCloud