UHCI: no dummy TDs for Iso QHs (85a975d0) · Commits · 戴 / test

drivers/usb/host/uhci-debug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ static int uhci_show_qh(struct uhci_qh qh, char buf, int len, int space)
		space, "", nurbs);
		}

		if (qh->udev) {
		if (qh->dummy_td) {
		out += sprintf(out, "%*s Dummy TD\n", space, "");
		out += uhci_show_td(qh->dummy_td, out, len - (out - buf), 0);
		}

+10 −7

Original line number	Diff line number	Diff line
		@@ -248,16 +248,18 @@ static struct uhci_qh uhci_alloc_qh(struct uhci_hcd uhci,
		INIT_LIST_HEAD(&qh->node);

		if (udev) { /* Normal QH */
		qh->type = hep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
		if (qh->type != USB_ENDPOINT_XFER_ISOC) {
		qh->dummy_td = uhci_alloc_td(uhci);
		if (!qh->dummy_td) {
		dma_pool_free(uhci->qh_pool, qh, dma_handle);
		return NULL;
		}
		}
		qh->state = QH_STATE_IDLE;
		qh->hep = hep;
		qh->udev = udev;
		hep->hcpriv = qh;
		qh->type = hep->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;

		} else { /* Skeleton QH */
		qh->state = QH_STATE_ACTIVE;
		@@ -275,6 +277,7 @@ static void uhci_free_qh(struct uhci_hcd uhci, struct uhci_qh qh)
		list_del(&qh->node);
		if (qh->udev) {
		qh->hep->hcpriv = NULL;
		if (qh->dummy_td)
		uhci_free_td(uhci, qh->dummy_td);
		}
		dma_pool_free(uhci->qh_pool, qh, qh->dma_handle);
		@@ -327,7 +330,7 @@ static int uhci_cleanup_queue(struct uhci_hcd uhci, struct uhci_qh qh,
		goto done;
		qh->element = UHCI_PTR_TERM;

		/* Control pipes have to worry about toggles */
		/* Control pipes don't have to worry about toggles */
		if (qh->type == USB_ENDPOINT_XFER_CONTROL)
		goto done;