From: Dan Carpenter Date: Tue, 8 Aug 2023 08:28:09 +0000 (+0300) Subject: misc: microchip: pci1xxxx: Fix some NULL vs IS_ERR() bugs X-Git-Tag: v6.6.7~2016^2~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a652fe5e38d906621e9c54a7d14ca4e030ab4f6;p=platform%2Fkernel%2Flinux-starfive.git misc: microchip: pci1xxxx: Fix some NULL vs IS_ERR() bugs The devm_nvmem_register() function returns error pointers. It never returns NULL. Update the checks accordingly. Fixes: 0969001569e4 ("misc: microchip: pci1xxxx: Add support to read and write into PCI1XXXX OTP via NVMEM sysfs") Signed-off-by: Dan Carpenter Link: https://lore.kernel.org/r/043df330-222b-4c2c-ae19-ed2f731bfe0b@moroto.mountain Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c index 3d3d157..16695cb 100644 --- a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c +++ b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c @@ -379,8 +379,8 @@ static int pci1xxxx_otp_eeprom_probe(struct auxiliary_device *aux_dev, priv->nvmem_eeprom = devm_nvmem_register(&aux_dev->dev, &priv->nvmem_config_eeprom); - if (!priv->nvmem_eeprom) - return -ENOMEM; + if (IS_ERR(priv->nvmem_eeprom)) + return PTR_ERR(priv->nvmem_eeprom); } release_sys_lock(priv); @@ -398,8 +398,8 @@ static int pci1xxxx_otp_eeprom_probe(struct auxiliary_device *aux_dev, priv->nvmem_otp = devm_nvmem_register(&aux_dev->dev, &priv->nvmem_config_otp); - if (!priv->nvmem_otp) - return -ENOMEM; + if (IS_ERR(priv->nvmem_otp)) + return PTR_ERR(priv->nvmem_otp); return ret; }