summaryrefslogtreecommitdiff
path: root/payloads/libpayload/drivers/usb
diff options
context:
space:
mode:
authorMathias Krause <mathias.krause@secunet.com>2012-05-29 16:19:19 +0200
committerPatrick Georgi <patrick@georgi-clan.de>2012-06-01 12:22:38 +0200
commit7b7b5666f0d286989402c2372cafb4e02e130dae (patch)
treecf823efb02c9a168628d2730d4dbc0f2e253053d /payloads/libpayload/drivers/usb
parent5c4e7aa9e5914293877ef98e007d46732666cfaf (diff)
downloadcoreboot-7b7b5666f0d286989402c2372cafb4e02e130dae.tar.xz
libpayload: fix UHCI timeout
UHCI commands should have a timeout of 30ms, not 30s! Change-Id: Iebcf338317164eb1e683e1de850ffab5022ca3a1 Signed-off-by: Mathias Krause <mathias.krause@secunet.com> Reviewed-on: http://review.coreboot.org/1085 Reviewed-by: Mathias Krause <minipli@googlemail.com> Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'payloads/libpayload/drivers/usb')
-rw-r--r--payloads/libpayload/drivers/usb/uhci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/payloads/libpayload/drivers/usb/uhci.c b/payloads/libpayload/drivers/usb/uhci.c
index d9a1a10624..8f2321eedf 100644
--- a/payloads/libpayload/drivers/usb/uhci.c
+++ b/payloads/libpayload/drivers/usb/uhci.c
@@ -262,12 +262,12 @@ uhci_stop (hci_t *controller)
static td_t *
wait_for_completed_qh (hci_t *controller, qh_t *qh)
{
- int timeout = 1000000; /* max 30 ms. */
+ int timeout = 1000; /* max 30 ms. */
void *current = GET_TD (qh->elementlinkptr);
while (((qh->elementlinkptr & FLISTP_TERMINATE) == 0) && (timeout-- > 0)) {
if (current != GET_TD (qh->elementlinkptr)) {
current = GET_TD (qh->elementlinkptr);
- timeout = 1000000;
+ timeout = 1000;
}
uhci_reg_write16(controller, USBSTS,
uhci_reg_read16(controller, USBSTS) | 0); // clear resettable registers