summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2012-11-12 16:19:21 +0100
committerRonald G. Minnich <rminnich@gmail.com>2012-11-14 17:44:36 +0100
commitaaa212d17d0070850f1dd2195129788acc978a9f (patch)
tree96c4c38d994321e86cf16a5362d5909a8c27acac
parentd633dda995c78f4f2d57d369c1e2baa591c0433a (diff)
libpayload: Do not call ohci_reset() from ohci_init()
When ohci_reset() was implemented, OHCI controllers stopped working since the stub ohci_reset() is called at the end of ohci_init(). This is fixed by removing the call. To prevent further problems the call to the xhci_reset() stub is removed, too. Change-Id: If89825c8e6caf40f7f4fe078e8b2e90054a54ba2 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: http://review.coreboot.org/1850 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--payloads/libpayload/drivers/usb/ohci.c1
-rw-r--r--payloads/libpayload/drivers/usb/xhci.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c
index 095eec93b0..51af9504fe 100644
--- a/payloads/libpayload/drivers/usb/ohci.c
+++ b/payloads/libpayload/drivers/usb/ohci.c
@@ -170,7 +170,6 @@ ohci_init (pcidev_t addr)
controller->devices[0]->controller = controller;
controller->devices[0]->init = ohci_rh_init;
controller->devices[0]->init (controller->devices[0]);
- ohci_reset (controller);
return controller;
}
diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c
index f784686b69..d5ee134041 100644
--- a/payloads/libpayload/drivers/usb/xhci.c
+++ b/payloads/libpayload/drivers/usb/xhci.c
@@ -195,7 +195,6 @@ xhci_init (pcidev_t addr)
controller->devices[0]->init = xhci_rh_init;
controller->devices[0]->init (controller->devices[0]);
- xhci_reset (controller);
return controller;
}