| From e5b51f216334d6cc7ee23082aced33cbcc92e3d5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 4 Mar 2021 04:59:09 +0000 |
| Subject: watchdog: jz4740: Fix return value check in jz4740_wdt_probe() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| [ Upstream commit 29e85f53fb58b45b9e9276dcdf1f1cb762dd1c9f ] |
| |
| In case of error, the function device_node_to_regmap() returns |
| ERR_PTR() and never returns NULL. The NULL test in the return |
| value check should be replaced with IS_ERR(). |
| |
| Fixes: 6d532143c915 ("watchdog: jz4740: Use regmap provided by TCU driver") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Acked-by: Paul Cercueil <paul@crapouillou.net> |
| Link: https://lore.kernel.org/r/20210304045909.945799-1-weiyongjun1@huawei.com |
| Signed-off-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/watchdog/jz4740_wdt.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c |
| index bdf9564efa29..395bde79e292 100644 |
| --- a/drivers/watchdog/jz4740_wdt.c |
| +++ b/drivers/watchdog/jz4740_wdt.c |
| @@ -176,9 +176,9 @@ static int jz4740_wdt_probe(struct platform_device *pdev) |
| watchdog_set_drvdata(jz4740_wdt, drvdata); |
| |
| drvdata->map = device_node_to_regmap(dev->parent->of_node); |
| - if (!drvdata->map) { |
| + if (IS_ERR(drvdata->map)) { |
| dev_err(dev, "regmap not found\n"); |
| - return -EINVAL; |
| + return PTR_ERR(drvdata->map); |
| } |
| |
| return devm_watchdog_register_device(dev, &drvdata->wdt); |
| -- |
| 2.30.2 |
| |
