Browse Source

Merge pull request #3031 from enkiller/pr1

[components][drivers][sdio]修复 SDIO product 为空的问题
Bernard Xiong 5 years ago
parent
commit
8bbf42444e
1 changed files with 10 additions and 0 deletions
  1. 10 0
      components/drivers/sdio/sdio.c

+ 10 - 0
components/drivers/sdio/sdio.c

@@ -709,6 +709,16 @@ static rt_int32_t sdio_initialize_function(struct rt_mmcsd_card *card,
     if (ret)
         goto err1;
 
+    /*
+     * product/manufacturer id is optional for function CIS, so
+     * copy it from the card structure as needed.
+     */
+    if (func->product == 0)
+    {
+        func->manufacturer = card->cis.manufacturer;
+        func->product = card->cis.product;
+    }
+
     card->sdio_function[func_num] = func;
 
     return 0;