lkml.org 
[lkml]   [2024]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH] watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe()
    From
    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 <nichen@iscas.ac.cn>

    Reviewed-by: Guenter Roeck <linux@roeck-us.net>

    > ---
    > 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)) {


    \
     
     \ /
      Last update: 2024-05-27 18:04    [W:8.252 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site