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

[linux-2.6-microblaze.git] / drivers / spi / spi-mem.c

diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index ef53290..a1b4d08 100644 (file)
--- 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);