summaryrefslogtreecommitdiff
path: root/drivers/usb/host/ehci-q.c
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2005-09-09 14:26:01 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-09 14:26:01 -0700
commit8ccc457722ba226ea72fca6f9ba3b54535d4749e (patch)
treee323eda3b7ed55a5398751021e8031c1cae56f9d /drivers/usb/host/ehci-q.c
parent20dd026d7f5a6972dc78b4928a99620001fa547d (diff)
parent5dce225bd9ea60e28e17076de63df0dee51b2883 (diff)
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/usb/host/ehci-q.c')
-rw-r--r--drivers/usb/host/ehci-q.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 20df01a79b2..940d38ca7d9 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -677,6 +677,9 @@ qh_make (
goto done;
}
} else {
+ struct usb_tt *tt = urb->dev->tt;
+ int think_time;
+
/* gap is f(FS/LS transfer times) */
qh->gap_uf = 1 + usb_calc_bus_time (urb->dev->speed,
is_input, 0, maxp) / (125 * 1000);
@@ -690,6 +693,10 @@ qh_make (
qh->c_usecs = HS_USECS (0);
}
+ think_time = tt ? tt->think_time : 0;
+ qh->tt_usecs = NS_TO_US (think_time +
+ usb_calc_bus_time (urb->dev->speed,
+ is_input, 0, max_packet (maxp)));
qh->period = urb->interval;
}
}