diff options
| author | chenzx <[email protected]> | 2021-07-14 20:17:38 +0800 |
|---|---|---|
| committer | chenzx <[email protected]> | 2021-07-14 20:17:38 +0800 |
| commit | eb29bb5318b2d4b0a3ff48ed906b72c074bcc17d (patch) | |
| tree | 00b8f30ba88768b25e9e3e3703ea3d6a10cb699e /components | |
| parent | 236e01bead06f16dade39916fae73906767f447a (diff) | |
| parent | 66cc36c70a117edc991558a80087a6d545f50fbe (diff) | |
Merge branch 'master' of https://github.com/wormsX/rt-thread
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/sdio/mmc.c | 4 | ||||
| -rw-r--r-- | components/libc/pthreads/semaphore.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/drivers/sdio/mmc.c b/components/drivers/sdio/mmc.c index d8f3a9e0a5..bebfa39ea2 100644 --- a/components/drivers/sdio/mmc.c +++ b/components/drivers/sdio/mmc.c @@ -122,7 +122,7 @@ static int mmc_get_ext_csd(struct rt_mmcsd_card *card, rt_uint8_t **new_ext_csd) *new_ext_csd = RT_NULL; - if (GET_BITS(card->resp_cid, 122, 4) < 4) + if (GET_BITS(card->resp_csd, 122, 4) < 4) return 0; /* @@ -303,7 +303,7 @@ static int mmc_select_bus_width(struct rt_mmcsd_card *card, rt_uint8_t *ext_csd) unsigned idx, trys, bus_width = 0; int err = 0; - if (GET_BITS(card->resp_cid, 122, 4) < 4) + if (GET_BITS(card->resp_csd, 122, 4) < 4) return 0; /* diff --git a/components/libc/pthreads/semaphore.c b/components/libc/pthreads/semaphore.c index 398cdf1f49..199b33bfe8 100644 --- a/components/libc/pthreads/semaphore.c +++ b/components/libc/pthreads/semaphore.c @@ -186,7 +186,7 @@ int sem_init(sem_t *sem, int pshared, unsigned int value) rt_snprintf(name, sizeof(name), "psem%02d", psem_number++); sem->sem = rt_sem_create(name, value, RT_IPC_FLAG_FIFO); - if (sem == RT_NULL) + if (sem->sem == RT_NULL) { rt_set_errno(ENOMEM); |