From: YueHaibing <yuehaibing@huawei.com>
Date: Sat, 31 Oct 2020 03:30:42 +0000 (+0800)
Subject: spi: spi-mem: Fix passing zero to 'PTR_ERR' warning
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a9c52d42814a44472fe1205775320ec20f556908;p=linux.git

spi: spi-mem: Fix passing zero to 'PTR_ERR' warning

Fix smatch warning:

drivers/spi/spi-mem.c:746 spi_mem_probe() warn: passing zero to 'PTR_ERR'

Fixes: 5d27a9c8ea9e ("spi: spi-mem: Extend the SPI mem interface to set a custom memory name")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Link: https://lore.kernel.org/r/20201031033042.42892-1-yuehaibing@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index ef53290b7d24d..a1b4d085834aa 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -743,7 +743,7 @@ static int spi_mem_probe(struct spi_device *spi)
 		mem->name = dev_name(&spi->dev);
 
 	if (IS_ERR_OR_NULL(mem->name))
-		return PTR_ERR(mem->name);
+		return PTR_ERR_OR_ZERO(mem->name);
 
 	spi_set_drvdata(spi, mem);