Re: [PATCH -next] watchdog: wdat_wdt: fix return value check in wdat_wdt_probe()

[Guenter Roeck <linux@roeck-us.net>]

On Wed, Sep 28, 2016 at 02:51:26PM +0000, Wei Yongjun wrote:
> From: Wei Yongjun <weiyongjun1@huawei.com>
> 
> In case of error, the function devm_ioremap_resource() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check should
> be replaced with IS_ERR().
> 
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>

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

> ---
>  drivers/watchdog/wdat_wdt.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
> index 6b64645..4594723 100644
> --- a/drivers/watchdog/wdat_wdt.c
> +++ b/drivers/watchdog/wdat_wdt.c
> @@ -351,16 +351,17 @@ static int wdat_wdt_probe(struct platform_device *pdev)
>  		res = &pdev->resource[i];
>  		if (resource_type(res) == IORESOURCE_MEM) {
>  			reg = devm_ioremap_resource(&pdev->dev, res);
> +			if (IS_ERR(reg))
> +				return PTR_ERR(reg);
>  		} else if (resource_type(res) == IORESOURCE_IO) {
>  			reg = devm_ioport_map(&pdev->dev, res->start, 1);
> +			if (!reg)
> +				return -ENOMEM;
>  		} else {
>  			dev_err(&pdev->dev, "Unsupported resource\n");
>  			return -EINVAL;
>  		}
>  
> -		if (!reg)
> -			return -ENOMEM;
> -
>  		regs[i] = reg;
>  	}
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html