|
 |
a5bd9f6 |
From 7fa632d01cbce0bbbcceeb9823593a61f1e86820 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Fri, 12 Apr 2013 20:51:11 +0200
|
|
|
a5bd9f6 |
Subject: [PATCH 292/364] * grub-core/bus/usb/ehci.c
|
|
|
a5bd9f6 |
(grub_ehci_fini_hw): Ignore errors, not much we can do about it
|
|
|
a5bd9f6 |
anyway.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
grub-core/bus/usb/ehci.c | 6 ++----
|
|
|
a5bd9f6 |
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index e8e4569..0d5c836 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,3 +1,8 @@
|
|
|
a5bd9f6 |
+2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * grub-core/bus/usb/ehci.c (grub_ehci_fini_hw): Ignore errors, not
|
|
|
a5bd9f6 |
+ much we can do about it anyway.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
2013-04-12 AleŇ° Nesrsta <starous@volny.cz>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
Fix handling of split transfers.
|
|
|
a5bd9f6 |
diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
|
|
|
a5bd9f6 |
index 18b12b2..d18a87f 100644
|
|
|
a5bd9f6 |
--- a/grub-core/bus/usb/ehci.c
|
|
|
a5bd9f6 |
+++ b/grub-core/bus/usb/ehci.c
|
|
|
a5bd9f6 |
@@ -1883,12 +1883,10 @@ grub_ehci_fini_hw (int noreturn __attribute__ ((unused)))
|
|
|
a5bd9f6 |
& grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
/* Check if EHCI is halted and halt it if not */
|
|
|
a5bd9f6 |
- if (grub_ehci_halt (e) != GRUB_USB_ERR_NONE)
|
|
|
a5bd9f6 |
- grub_error (GRUB_ERR_TIMEOUT, "fini_hw: EHCI halt timeout");
|
|
|
a5bd9f6 |
+ grub_ehci_halt (e);
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
/* Reset EHCI */
|
|
|
a5bd9f6 |
- if (grub_ehci_reset (e) != GRUB_USB_ERR_NONE)
|
|
|
a5bd9f6 |
- grub_error (GRUB_ERR_TIMEOUT, "fini_hw: EHCI reset timeout");
|
|
|
a5bd9f6 |
+ grub_ehci_reset (e);
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
return GRUB_USB_ERR_NONE;
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|