* grub-core/bus/usb/ehci.c (grub_ehci_fini_hw): Ignore errors, not

much we can do about it anyway.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-12 20:51:11 +02:00
parent 51a4c3e3b0
commit d70dbab77a
2 changed files with 7 additions and 4 deletions

View file

@ -1,3 +1,8 @@
2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/bus/usb/ehci.c (grub_ehci_fini_hw): Ignore errors, not
much we can do about it anyway.
2013-04-12 Aleš Nesrsta <starous@volny.cz> 2013-04-12 Aleš Nesrsta <starous@volny.cz>
Fix handling of split transfers. Fix handling of split transfers.

View file

@ -1883,12 +1883,10 @@ grub_ehci_fini_hw (int noreturn __attribute__ ((unused)))
& grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND)); & grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
/* Check if EHCI is halted and halt it if not */ /* Check if EHCI is halted and halt it if not */
if (grub_ehci_halt (e) != GRUB_USB_ERR_NONE) grub_ehci_halt (e);
grub_error (GRUB_ERR_TIMEOUT, "fini_hw: EHCI halt timeout");
/* Reset EHCI */ /* Reset EHCI */
if (grub_ehci_reset (e) != GRUB_USB_ERR_NONE) grub_ehci_reset (e);
grub_error (GRUB_ERR_TIMEOUT, "fini_hw: EHCI reset timeout");
} }
return GRUB_USB_ERR_NONE; return GRUB_USB_ERR_NONE;