From aaa212d17d0070850f1dd2195129788acc978a9f Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Mon, 12 Nov 2012 16:19:21 +0100 Subject: [PATCH] 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 Reviewed-on: http://review.coreboot.org/1850 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- payloads/libpayload/drivers/usb/ohci.c | 1 - payloads/libpayload/drivers/usb/xhci.c | 1 - 2 files changed, 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; }