summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@linaro.org>2023-08-08 11:28:09 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-12 12:58:56 +0200
commit5a652fe5e38d906621e9c54a7d14ca4e030ab4f6 (patch)
tree70ae434b63ac6ee95b3edb5ed1b025c6450f606d
parent1314e1220d7d31aa99ed551e42d76ba7be8e5bf4 (diff)
downloadlinux-5a652fe5e38d906621e9c54a7d14ca4e030ab4f6.tar.gz
linux-5a652fe5e38d906621e9c54a7d14ca4e030ab4f6.tar.bz2
linux-5a652fe5e38d906621e9c54a7d14ca4e030ab4f6.zip
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 <dan.carpenter@linaro.org> Link: https://lore.kernel.org/r/043df330-222b-4c2c-ae19-ed2f731bfe0b@moroto.mountain Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
index 3d3d1578119a..16695cb5e69c 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;
}