Merge tag '5.20-rc-smb3-client-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / drivers / nvmem / jz4780-efuse.c

diff --git a/drivers/nvmem/jz4780-efuse.c b/drivers/nvmem/jz4780-efuse.c
index 512e187..0b01b84 100644 (file)
--- a/drivers/nvmem/jz4780-efuse.c
+++ b/drivers/nvmem/jz4780-efuse.c
@@ -211,10 +211,8 @@ static int jz4780_efuse_probe(struct platform_device *pdev)
        cfg.priv = efuse;
 
        nvmem = devm_nvmem_register(dev, &cfg);
-       if (IS_ERR(nvmem))
-               return PTR_ERR(nvmem);
 
-       return 0;
+       return PTR_ERR_OR_ZERO(nvmem);
 }
 
 static const struct of_device_id jz4780_efuse_match[] = {