[PATCH] power: reset: at91-reset: check properly the return value of devm_of_iomap

Sebastian Reichel sebastian.reichel at collabora.com
Sat Oct 2 08:44:23 PDT 2021


Hi,

On Thu, Sep 30, 2021 at 01:09:28PM +0300, Claudiu Beznea wrote:
> devm_of_iomap() returns error code or valid pointer. Check its return
> value with IS_ERR().
> 
> Fixes: bd3127733f2c ("power: reset: at91-reset: use devm_of_iomap")
> Reported-by: Cristian Birsan <cristian.birsan at microchip.com>
> Signed-off-by: Claudiu Beznea <claudiu.beznea at microchip.com>
> ---

Thanks, queued.

-- Sebastian

>  drivers/power/reset/at91-reset.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
> index 026649409135..64def79d557a 100644
> --- a/drivers/power/reset/at91-reset.c
> +++ b/drivers/power/reset/at91-reset.c
> @@ -193,7 +193,7 @@ static int __init at91_reset_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>  
>  	reset->rstc_base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL);
> -	if (!reset->rstc_base) {
> +	if (IS_ERR(reset->rstc_base)) {
>  		dev_err(&pdev->dev, "Could not map reset controller address\n");
>  		return -ENODEV;
>  	}
> @@ -203,7 +203,7 @@ static int __init at91_reset_probe(struct platform_device *pdev)
>  		for_each_matching_node_and_match(np, at91_ramc_of_match, &match) {
>  			reset->ramc_lpr = (u32)match->data;
>  			reset->ramc_base[idx] = devm_of_iomap(&pdev->dev, np, 0, NULL);
> -			if (!reset->ramc_base[idx]) {
> +			if (IS_ERR(reset->ramc_base[idx])) {
>  				dev_err(&pdev->dev, "Could not map ram controller address\n");
>  				of_node_put(np);
>  				return -ENODEV;
> -- 
> 2.25.1
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20211002/d170d73a/attachment.sig>


More information about the linux-arm-kernel mailing list