RT-Thread
diff --git a/‎components/drivers/sdio/dev_sdio.c‎
Lines changed: 6 additions & 4 deletions b/‎components/drivers/sdio/dev_sdio.c‎
Lines changed: 6 additions & 4 deletions
@@ -1378,10 +1378,11 @@ rt_int32_t sdio_unregister_driver(struct rt_sdio_driver *driver)
     for (l = (&sdio_drivers)->next; l != &sdio_drivers; l = l->next)
     {
         sd = (struct sdio_driver *)rt_list_entry(l, struct sdio_driver, list);
-        if (sd->drv != driver)
+        if (sd->drv == driver)
         {
-            sd = RT_NULL;
+            break;
         }
+        sd = RT_NULL;
     }
 
     if (sd == RT_NULL)
@@ -1396,11 +1397,12 @@ rt_int32_t sdio_unregister_driver(struct rt_sdio_driver *driver)
         if (card != RT_NULL)
         {
             driver->remove(card);
-            rt_list_remove(&sd->list);
-            rt_free(sd);
         }
     }
 
+    rt_list_remove(&sd->list);
+    rt_free(sd);
+
     return 0;
 }
Original file line number	Diff line number	Diff line change
`@@ -1378,10 +1378,11 @@ rt_int32_t sdio_unregister_driver(struct rt_sdio_driver *driver)`
`1378`	`1378`	`for (l = (&sdio_drivers)->next; l != &sdio_drivers; l = l->next)`
`1379`	`1379`	`{`
`1380`	`1380`	`sd = (struct sdio_driver *)rt_list_entry(l, struct sdio_driver, list);`
`1381`		`- if (sd->drv != driver)`
	`1381`	`+ if (sd->drv == driver)`
`1382`	`1382`	`{`
`1383`		`- sd = RT_NULL;`
	`1383`	`+ break;`
`1384`	`1384`	`}`
	`1385`	`+ sd = RT_NULL;`
`1385`	`1386`	`}`
`1386`	`1387`
`1387`	`1388`	`if (sd == RT_NULL)`
`@@ -1396,11 +1397,12 @@ rt_int32_t sdio_unregister_driver(struct rt_sdio_driver *driver)`
`1396`	`1397`	`if (card != RT_NULL)`
`1397`	`1398`	`{`
`1398`	`1399`	`driver->remove(card);`
`1399`		`- rt_list_remove(&sd->list);`
`1400`		`- rt_free(sd);`
`1401`	`1400`	`}`
`1402`	`1401`	`}`
`1403`	`1402`
	`1403`	`+ rt_list_remove(&sd->list);`
	`1404`	`+ rt_free(sd);`
	`1405`	`+`
`1404`	`1406`	`return 0;`
`1405`	`1407`	`}`
`1406`	`1408`