Signed-off-by: Matthias Beyer <[email protected]>
---
drivers/usb/core/hcd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 3a2667c..5d13d6c 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1120,18 +1120,18 @@ long usb_calc_bus_time (int speed, int is_input, int
isoc, int bytecount)
case USB_SPEED_LOW: /* INTR only */
if (is_input) {
tmp = (67667L * (31L + 10L * BitTime (bytecount))) /
1000L;
- return (64060L + (2 * BW_HUB_LS_SETUP) + BW_HOST_DELAY
+ tmp);
+ return 64060L + (2 * BW_HUB_LS_SETUP) + BW_HOST_DELAY +
tmp;
} else {
tmp = (66700L * (31L + 10L * BitTime (bytecount))) /
1000L;
- return (64107L + (2 * BW_HUB_LS_SETUP) + BW_HOST_DELAY
+ tmp);
+ return 64107L + (2 * BW_HUB_LS_SETUP) + BW_HOST_DELAY +
tmp;
}
case USB_SPEED_FULL: /* ISOC or INTR */
if (isoc) {
tmp = (8354L * (31L + 10L * BitTime (bytecount))) /
1000L;
- return (((is_input) ? 7268L : 6265L) + BW_HOST_DELAY +
tmp);
+ return ((is_input) ? 7268L : 6265L) + BW_HOST_DELAY +
tmp;
} else {
tmp = (8354L * (31L + 10L * BitTime (bytecount))) /
1000L;
- return (9107L + BW_HOST_DELAY + tmp);
+ return 9107L + BW_HOST_DELAY + tmp;
}
case USB_SPEED_HIGH: /* ISOC or INTR */
/* FIXME adjust for input vs output */
--
1.8.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
