* grub-core/bus/usb/ehci.c (grub_ehci_restore_hw): Return right enum

	type.
	(grub_ehci_fini_hw): Likewise.
	* grub-core/bus/usb/usbhub.c (grub_usb_add_hub): Likewise.

diff --git a/ChangeLog b/ChangeLog
index eefd621bc372749cf25cca883587737ee5931d29..787c7a144e0e2305385b4ca02e25d16d1fe31746 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/bus/usb/ehci.c (grub_ehci_restore_hw): Return right enum
+       type.
+       (grub_ehci_fini_hw): Likewise.
+       * grub-core/bus/usb/usbhub.c (grub_usb_add_hub): Likewise.
+
 2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/usb.h (grub_usb_controller_dev): Make portstatus

diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
index 59c56ba60a33626f978d04212dd3863c749940f1..b592f088cf313436251488c7fc2e37af7059e1a0 100644 (file)
--- a/grub-core/bus/usb/ehci.c
+++ b/grub-core/bus/usb/ehci.c
@@ -1887,7 +1887,7 @@ grub_ehci_restore_hw (void)
        }
     }
 
-  return GRUB_USB_ERR_NONE;
+  return GRUB_ERR_NONE;
 }
 
 static grub_err_t
@@ -1910,7 +1910,7 @@ grub_ehci_fini_hw (int noreturn __attribute__ ((unused)))
       grub_ehci_reset (e);
     }
 
-  return GRUB_USB_ERR_NONE;
+  return GRUB_ERR_NONE;
 }
 
 static struct grub_usb_controller_dev usb_controller = {

diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
index 75d23b1eb68c2610ffc33e0665244dd053593468..34a7ff1b5f848cb2a7d5d9efefa5e83d928422b4 100644 (file)
--- a/grub-core/bus/usb/usbhub.c
+++ b/grub-core/bus/usb/usbhub.c
@@ -195,7 +195,7 @@ grub_usb_add_hub (grub_usb_device_t dev)
 
   rescan = 1;
 
-  return GRUB_ERR_NONE;
+  return GRUB_USB_ERR_NONE;
 }
 
 static void