mtd: spi-nor: Fix an error code in spi_nor_read_raw()

The problem is that if "ret" is negative then when we check if
"ret > len", that condition is going to be true because of type
promotion.  So this patch re-orders the code to check for negatives
first and preserve those error codes.

Fixes: f384b352cbf0 ("mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables")
Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Tudor Ambarus <[email protected]>

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 3790830d0d99301c77e5dbe9424e504f512a5f41..ba99d903eda025867341251abb1c33db1ba629ea 100644 (file)
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2907,10 +2907,10 @@ static int spi_nor_read_raw(struct spi_nor *nor, u32 addr, size_t len, u8 *buf)
 
        while (len) {
                ret = spi_nor_read_data(nor, addr, len, buf);
-               if (!ret || ret > len)
-                       return -EIO;
                if (ret < 0)
                        return ret;
+               if (!ret || ret > len)
+                       return -EIO;
 
                buf += ret;
                addr += ret;