From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6ED3DC433E6 for ; Sun, 7 Mar 2021 15:56:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F565650F8 for ; Sun, 7 Mar 2021 15:56:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232301AbhCGP4O convert rfc822-to-8bit (ORCPT ); Sun, 7 Mar 2021 10:56:14 -0500 Received: from aposti.net ([89.234.176.197]:34344 "EHLO aposti.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232294AbhCGPzt (ORCPT ); Sun, 7 Mar 2021 10:55:49 -0500 Date: Sun, 07 Mar 2021 15:55:36 +0000 From: Paul Cercueil Subject: Re: [PATCH -next] watchdog: jz4740: Fix return value check in jz4740_wdt_probe() To: 'Wei Yongjun Cc: Wim Van Sebroeck , Guenter Roeck , linux-mips@vger.kernel.org, linux-watchdog@vger.kernel.org, kernel-janitors@vger.kernel.org, Hulk Robot Message-Id: In-Reply-To: <20210304045909.945799-1-weiyongjun1@huawei.com> References: <20210304045909.945799-1-weiyongjun1@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Le jeu. 4 mars 2021 à 4:59, 'Wei Yongjun a écrit : > From: Wei Yongjun > > 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 > Signed-off-by: Wei Yongjun Acked-by: Paul Cercueil Cheers, -Paul > --- > 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); >