diff options
| author | Bernard Xiong <[email protected]> | 2019-12-30 19:48:43 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-30 19:48:43 +0800 |
| commit | 93b50db41d18bd6b51d23e01f5ee457ca5e0fd12 (patch) | |
| tree | fa329fb8a039e87786de29158f18a499c0898c89 | |
| parent | 4bee990bbf0e8d78ab5dbe2d85b40feb59ae34bc (diff) | |
| parent | b135b70934a7fcfcede15fb53248b96b24045a8e (diff) | |
Merge pull request #3297 from nsearchf/master
修复不能发现禁止写spi flash失败的情形
| -rw-r--r-- | components/drivers/spi/sfud/src/sfud.c | 2 | ||||
| -rw-r--r-- | src/thread.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/drivers/spi/sfud/src/sfud.c b/components/drivers/spi/sfud/src/sfud.c index f666b06806..e5b03131ff 100644 --- a/components/drivers/spi/sfud/src/sfud.c +++ b/components/drivers/spi/sfud/src/sfud.c @@ -897,7 +897,7 @@ static sfud_err set_write_enabled(const sfud_flash *flash, bool enabled) { if (enabled && (register_status & SFUD_STATUS_REGISTER_WEL) == 0) { SFUD_INFO("Error: Can't enable write status."); return SFUD_ERR_WRITE; - } else if (!enabled && (register_status & SFUD_STATUS_REGISTER_WEL) == 1) { + } else if (!enabled && (register_status & SFUD_STATUS_REGISTER_WEL) != 0) { SFUD_INFO("Error: Can't disable write status."); return SFUD_ERR_WRITE; } diff --git a/src/thread.c b/src/thread.c index 3a3c97d0b6..74a573b78f 100644 --- a/src/thread.c +++ b/src/thread.c @@ -585,7 +585,7 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick) return RT_EOK; } -RTM_EXPORT(rt_thread_delay_util); +RTM_EXPORT(rt_thread_delay_until); /** * This function will let current thread delay for some milliseconds. |