Merge branch 'master' of git://git.denx.de/u-boot-spi

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 7ffa136f5a47a6853d587a032597fe68b96f8bfe..b7b7f0044e74ce57c8c460e35cae1c2c6d65fb67 100644 (file)
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -767,8 +767,8 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len)
                return ret;
 
        /* Cannot unlock; would unlock larger region than requested */
-       if (stm_is_locked_sr(flash, status_old, ofs - flash->erase_size,
-                            flash->erase_size))
+       if (stm_is_locked_sr(flash, ofs - flash->erase_size, flash->erase_size,
+                            status_old))
                return -EINVAL;
        /*
         * Need largest pow such that:

diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index feec3e80b6aeb0a05ff69c1fb8c0b206aa54b930..542b6cfe355b3e3212f7cb59d5c49792e1333e4c 100644 (file)
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define TX_BUFFER_SIZE         0x40
 #endif
 
-#define OFFSET_BITS_MASK       GENMASK(24, 0)
+#define OFFSET_BITS_MASK       GENMASK(23, 0)
 
 #define FLASH_STATUS_WEL       0x02