2024-04-26 08:04:49

by Chen Ni

Subject: [PATCH] watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe()

devm_ioremap() doesn't return error pointers, it returns NULL on error.
Update the check accordingly.

Fixes: e86bd43bcfc5 ("watchdog: sa1100: use platform device registration")
Signed-off-by: Chen Ni <[email protected]>
---
drivers/watchdog/sa1100_wdt.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 5d2df008b92a..34a917221e31 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -191,9 +191,8 @@ static int sa1100dog_probe(struct platform_device *pdev)
if (!res)
return -ENXIO;
reg_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
- ret = PTR_ERR_OR_ZERO(reg_base);
- if (ret)
- return ret;
+ if (!reg_base)
+ return -ENOMEM;

clk = clk_get(NULL, "OSTIMER0");
if (IS_ERR(clk)) {
--
2.25.1

2024-04-26 13:38:20

by Guenter Roeck

Subject: Re: [PATCH] watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe()

On 4/26/24 00:58, Chen Ni wrote:
> devm_ioremap() doesn't return error pointers, it returns NULL on error.
> Update the check accordingly.
>
> Fixes: e86bd43bcfc5 ("watchdog: sa1100: use platform device registration")
> Signed-off-by: Chen Ni <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/watchdog/sa1100_wdt.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
> index 5d2df008b92a..34a917221e31 100644
> --- a/drivers/watchdog/sa1100_wdt.c
> +++ b/drivers/watchdog/sa1100_wdt.c
> @@ -191,9 +191,8 @@ static int sa1100dog_probe(struct platform_device *pdev)
> if (!res)
> return -ENXIO;
> reg_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> - ret = PTR_ERR_OR_ZERO(reg_base);
> - if (ret)
> - return ret;
> + if (!reg_base)
> + return -ENOMEM;
>
> clk = clk_get(NULL, "OSTIMER0");
> if (IS_ERR(clk)) {