diff mbox

uvcvideo causes ehci_hcd to halt

Message ID Pine.LNX.4.44L0.0910201101220.2887-100000@iolanthe.rowland.org (mailing list archive)
State Not Applicable
Headers show

Commit Message

Alan Stern Oct. 20, 2009, 3:07 p.m. UTC
None
diff mbox

Patch

Index: usb-2.6/drivers/usb/host/ehci-q.c
===================================================================
--- usb-2.6.orig/drivers/usb/host/ehci-q.c
+++ usb-2.6/drivers/usb/host/ehci-q.c
@@ -818,6 +818,9 @@  qh_make (
 				dbg ("intr period %d uframes, NYET!",
 						urb->interval);
 				goto done;
+			} else if (qh->period > ehci->periodic_size) {
+				qh->period = ehci->periodic_size;
+				urb->interval = qh->period << 3;
 			}
 		} else {
 			int		think_time;
@@ -840,6 +843,10 @@  qh_make (
 					usb_calc_bus_time (urb->dev->speed,
 					is_input, 0, max_packet (maxp)));
 			qh->period = urb->interval;
+			if (qh->period > ehci->periodic_size) {
+				qh->period = ehci->periodic_size;
+				urb->interval = qh->period;
+			}
 		}
 	}