diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-04 16:56:15 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-04 16:56:15 -0400 |
| commit | a5c96cab8f3c4ca9b2177dceb5de5a0edb31418e (patch) | |
| tree | 45692a1b3d770f721f4586ad81c206f1b8509b75 /drivers/usb/host/ehci-q.c | |
| parent | 30db1ae8640d3527ca7ac8df4bcbf14ccc6ae9cd (diff) | |
| parent | 1c5ad84516ae7ea4ec868436a910a6bd8d20215a (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'drivers/usb/host/ehci-q.c')
| -rw-r--r-- | drivers/usb/host/ehci-q.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c index d74b2d68a50e..4f97a4ad1ed3 100644 --- a/drivers/usb/host/ehci-q.c +++ b/drivers/usb/host/ehci-q.c | |||
| @@ -657,8 +657,8 @@ qh_make ( | |||
| 657 | * For control/bulk requests, the HC or TT handles these. | 657 | * For control/bulk requests, the HC or TT handles these. |
| 658 | */ | 658 | */ |
| 659 | if (type == PIPE_INTERRUPT) { | 659 | if (type == PIPE_INTERRUPT) { |
| 660 | qh->usecs = usb_calc_bus_time (USB_SPEED_HIGH, is_input, 0, | 660 | qh->usecs = NS_TO_US (usb_calc_bus_time (USB_SPEED_HIGH, is_input, 0, |
| 661 | hb_mult (maxp) * max_packet (maxp)); | 661 | hb_mult (maxp) * max_packet (maxp))); |
| 662 | qh->start = NO_FRAME; | 662 | qh->start = NO_FRAME; |
| 663 | 663 | ||
| 664 | if (urb->dev->speed == USB_SPEED_HIGH) { | 664 | if (urb->dev->speed == USB_SPEED_HIGH) { |