Commit 2dea75d9 authored Apr 12, 2011 by Dmitry Torokhov Committed by Sarah Sharp Apr 13, 2011

USB: xhci - also free streams when resetting devices



Currently, when resetting a device, xHCI driver disables all but one
endpoints and frees their rings, but leaves alone any streams that
might have been allocated. Later, when users try to free allocated
streams, we oops in xhci_setup_no_streams_ep_input_ctx() because
ep->ring is NULL.

Let's free not only rings but also stream data as well, so that
calling free_streams() on a device that was reset will be safe.

This should be queued for stable trees back to 2.6.35.

Reviewed-by: Micah Elizabeth Scott <micah@vmware.com>
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@kernel.org

parent 386139d7

drivers/usb/host/xhci.c

+12 −4

Original line number	Diff line number	Diff line
		@@ -2386,11 +2386,19 @@ int xhci_discover_or_reset_device(struct usb_hcd hcd, struct usb_device udev)
		/* Everything but endpoint 0 is disabled, so free or cache the rings. */
		last_freed_endpoint = 1;
		for (i = 1; i < 31; ++i) {
		if (!virt_dev->eps[i].ring)
		continue;
		struct xhci_virt_ep *ep = &virt_dev->eps[i];

		if (ep->ep_state & EP_HAS_STREAMS) {
		xhci_free_stream_info(xhci, ep->stream_info);
		ep->stream_info = NULL;
		ep->ep_state &= ~EP_HAS_STREAMS;
		}

		if (ep->ring) {
		xhci_free_or_cache_endpoint_ring(xhci, virt_dev, i);
		last_freed_endpoint = i;
		}
		}
		xhci_dbg(xhci, "Output context after successful reset device cmd:\n");
		xhci_dbg_ctx(xhci, virt_dev->out_ctx, last_freed_endpoint);
		ret = 0;

Admin message