diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2014-01-24 17:18:26 +0000 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2014-01-24 17:18:26 +0000 |
| commit | e1e57aa891deef00276b26a4569802a5cd13ce92 (patch) | |
| tree | 9061825c6c9f5c8bed33d5b2087101ce38f23fdf /MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c | |
| parent | 18110e987bb049e24ade0fb63b5577def8f99114 (diff) | |
| parent | 04d965c0713468e055ef328f9f49903bc5944e54 (diff) | |
Merging uefi-next/linaro-release into masterHEADlinaro-uefi-2014.01master
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c')
| -rw-r--r-- | MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c index 59891b814..700e69e49 100644 --- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c +++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c @@ -2049,13 +2049,6 @@ EhcDriverBindingStop ( Ehc = EHC_FROM_THIS (Usb2Hc);
PciIo = Ehc->PciIo;
- //
- // Stop AsyncRequest Polling timer then stop the EHCI driver
- // and uninstall the EHCI protocl.
- //
- gBS->SetTimer (Ehc->PollTimer, TimerCancel, EHC_ASYNC_POLL_INTERVAL);
- EhcHaltHC (Ehc, EHC_GENERIC_TIMEOUT);
-
Status = gBS->UninstallProtocolInterface (
Controller,
&gEfiUsb2HcProtocolGuid,
@@ -2066,6 +2059,13 @@ EhcDriverBindingStop ( return Status;
}
+ //
+ // Stop AsyncRequest Polling timer then stop the EHCI driver
+ // and uninstall the EHCI protocl.
+ //
+ gBS->SetTimer (Ehc->PollTimer, TimerCancel, EHC_ASYNC_POLL_INTERVAL);
+ EhcHaltHC (Ehc, EHC_GENERIC_TIMEOUT);
+
if (Ehc->PollTimer != NULL) {
gBS->CloseEvent (Ehc->PollTimer);
}
|