Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 127329d7 authored by Hans de Goede's avatar Hans de Goede Committed by Sarah Sharp
Browse files

xhci: xhci_mem_cleanup: make sure cmd_ring_reserved_trbs really is 0 



cmd_ring_reserved_trbs gets decremented by xhci_free_stream_info(), so set it
to 0 after freeing all rings, otherwise it wraps around to a very large value
when rings with streams are free-ed.

Before this patch the wrap-around could be triggered when xhci_resume
calls xhci_mem_cleanup if the controller resume fails.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent 82aa0387

drivers/usb/host/xhci-mem.c

+1 −1
Original line number Diff line number Diff line
@@ -1812,7 +1812,6 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 


	if (xhci->lpm_command)

		xhci_free_command(xhci, xhci->lpm_command);

	xhci->cmd_ring_reserved_trbs = 0;

	if (xhci->cmd_ring)

		xhci_ring_free(xhci, xhci->cmd_ring);

	xhci->cmd_ring = NULL;
@@ -1877,6 +1876,7 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci) 
	}



no_bw:

	xhci->cmd_ring_reserved_trbs = 0;

	xhci->num_usb2_ports = 0;

	xhci->num_usb3_ports = 0;

	xhci->num_active_eps = 0;