Skip to content

Commit 68e3908

Browse files
authored
Merge branch 'master' into maintainer
2 parents 9626386 + 169d84d commit 68e3908

File tree

2 files changed

+31
-2
lines changed

2 files changed

+31
-2
lines changed

MAINTAINERS

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ tag: bsp_renesas
7777
path: bsp/renesas
7878
owners: Yuqiang Wang(kurisaW)<[email protected]>
7979

80+
tag: bsp_stm32
81+
path: bsp/stm32
82+
owners: Liya Huang(wdfk-prog)<[email protected]>
83+
8084
tag: bsp_stm32h723-st-nucleo
8185
path: bsp/stm32/stm32h723-st-nucleo
8286
owners: 下里巴人(hywing)<[email protected]>
@@ -89,9 +93,29 @@ tag: documentation
8993
path: documentation
9094
owners: Chen Wang(unicornx)<[email protected]>, Guorui Li(GorrayLi)<[email protected]>, Lian Wang(lianux-mm)<[email protected]>
9195

96+
tag: driver_can
97+
path: components/drivers/can
98+
owners: Liya Huang(wdfk-prog)<[email protected]>
99+
100+
tag: driver_i2c
101+
path: components/drivers/i2c
102+
owners: Liya Huang(wdfk-prog)<[email protected]>
103+
104+
tag: driver_pm
105+
path: components/drivers/pm
106+
owners: Liya Huang(wdfk-prog)<[email protected]>
107+
108+
tag: driver_spi
109+
path: components/drivers/spi
110+
owners: Liya Huang(wdfk-prog)<[email protected]>
111+
112+
tag: driver_ymodem
113+
path: components/utilities/ymodem
114+
owners: Liya Huang(wdfk-prog)<[email protected]>
115+
92116
tag: kernel
93117
path: src
94-
owners: Guorui Li(GorrayLi)<[email protected]>, Lian Wang(lianux-mm)<[email protected]>
118+
owners: Guorui Li(GorrayLi)<[email protected]>, Lian Wang(lianux-mm)<[email protected]>, Liya Huang(wdfk-prog)<[email protected]>
95119

96120
tag: libc
97121
path: components/libc

include/rtservice.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ rt_inline rt_slist_t *rt_slist_pop(rt_slist_t *l)
234234
if (node != (rt_slist_t *)0)
235235
{
236236
((struct rt_slist_node *)l)->next = node->next;
237+
node->next = RT_NULL;
237238
}
238239

239240
return node;
@@ -246,7 +247,11 @@ rt_inline rt_slist_t *rt_slist_remove(rt_slist_t *l, rt_slist_t *n)
246247
while (node->next && node->next != n) node = node->next;
247248

248249
/* remove node */
249-
if (node->next != (rt_slist_t *)0) node->next = node->next->next;
250+
if (node->next != (rt_slist_t *)0)
251+
{
252+
node->next = node->next->next;
253+
n->next = RT_NULL;
254+
}
250255

251256
return l;
252257
}

0 commit comments

Comments
 (0)