Merge branch 'master' of https://github.com/wormsX/rt-thread

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;
 
   /*

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);