leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Rini 2016-01-07 12:41:57 -05:00
commit 67ecb84ccb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/spi/spi_flash.c
View File

@ -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:

2
drivers/spi/fsl_qspi.c
View File

@ -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