From: Wei Yongjun Date: Fri, 17 Jun 2016 17:12:05 +0000 (+0000) Subject: watchdog: pic32-dmt: Fix return value check in pic32_dmt_probe() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fafdbabaf5c6a949168b384e159152f6e37427ba;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Reviewed-by: Guenter Roeck Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/pic32-dmt.c b/drivers/watchdog/pic32-dmt.c index 962f58c03353..5e8890eaa49f 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);