Changeset 47ab89e in mainline

Timestamp:

2017-10-25T13:56:30Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f668d60

Parents:

3cbc138

Message:

trb ring: fix freeing segments

File:

• uspace/drv/bus/usb/xhci/trb_ring.c (modified) (2 diffs)

uspace/drv/bus/usb/xhci/trb_ring.c

@@ -123 +123 @@
 int xhci_trb_ring_fini(xhci_trb_ring_t *ring)
 {
-        if (!ring)
-                return EOK;
-
-        list_foreach(ring->segments, segments_link, trb_segment_t, segment)
+        assert(ring);
+
+        list_foreach_safe(ring->segments, cur, next) {
+                trb_segment_t *segment = list_get_instance(cur, trb_segment_t, segments_link);
                 dmamem_unmap_anonymous(segment);
+        }
+
         return EOK;
 }
@@ -293 +295 @@
 int xhci_event_ring_fini(xhci_event_ring_t *ring)
 {
-        list_foreach(ring->segments, segments_link, trb_segment_t, segment)
+        list_foreach_safe(ring->segments, cur, next) {
+                trb_segment_t *segment = list_get_instance(cur, trb_segment_t, segments_link);
                 dmamem_unmap_anonymous(segment);
+        }
 
         if (ring->erst)