summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorMiraculousConch <[email protected]>2017-10-20 14:24:32 +0800
committerMiraculousConch <[email protected]>2017-10-20 14:24:32 +0800
commitbdc01934d25380810a28df3ce6e410948930690d (patch)
tree5fd55d4060e05c791321697aa40f2dc784180fa1 /components
parentc564605c98f326ac1e1b848458cdfa8d61487e20 (diff)
parentfbe3a4d1db8d198bd4d8a516d129c36c61d1d57b (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'components')
-rw-r--r--components/drivers/sdio/block_dev.c1
-rw-r--r--components/drivers/sdio/sdio.c7
2 files changed, 4 insertions, 4 deletions
diff --git a/components/drivers/sdio/block_dev.c b/components/drivers/sdio/block_dev.c
index 3e142ee6e4..c986556879 100644
--- a/components/drivers/sdio/block_dev.c
+++ b/components/drivers/sdio/block_dev.c
@@ -483,3 +483,4 @@ void rt_mmcsd_blk_init(void)
{
/* nothing */
}
+
diff --git a/components/drivers/sdio/sdio.c b/components/drivers/sdio/sdio.c
index 496765854e..dc0cd1eb96 100644
--- a/components/drivers/sdio/sdio.c
+++ b/components/drivers/sdio/sdio.c
@@ -33,8 +33,8 @@
#define RT_SDIO_THREAD_PRIORITY 0x40
#endif
-static rt_list_t sdio_cards;
-static rt_list_t sdio_drivers;
+static rt_list_t sdio_cards = RT_LIST_OBJECT_INIT(sdio_cards);
+static rt_list_t sdio_drivers = RT_LIST_OBJECT_INIT(sdio_drivers);
struct sdio_card
{
@@ -1397,7 +1397,6 @@ rt_int32_t sdio_unregister_driver(struct rt_sdio_driver *driver)
void rt_sdio_init(void)
{
- rt_list_init(&sdio_cards);
- rt_list_init(&sdio_drivers);
+
}