* grub-core/disk/usbms.c (grub_usbms_reset): Transform USB-style error

	into GRUB-style one.

diff --git a/ChangeLog b/ChangeLog
index 87f78e0bd167daba71509bd70ad9f8a8b48512b8..20a83dd8415feca7799ccd662340f796fdaba465 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/usbms.c (grub_usbms_reset): Transform USB-style error
+       into GRUB-style one.
+
 2011-03-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/bus/usb/usbtrans.c (grub_usb_control_msg): Return usb-style

diff --git a/grub-core/disk/usbms.c b/grub-core/disk/usbms.c
index 2e5d2459ae55931ff1bd866a2e139946c5618d9b..fcfe9e5d40c8cda11166bfc07250acd84538b83c 100644 (file)
--- a/grub-core/disk/usbms.c
+++ b/grub-core/disk/usbms.c
@@ -70,7 +70,11 @@ static int first_available_slot = 0;
 static grub_err_t
 grub_usbms_reset (grub_usb_device_t dev, int interface)
 {
-  return grub_usb_control_msg (dev, 0x21, 255, 0, interface, 0, 0);
+  grub_usb_err_t u;
+  u = grub_usb_control_msg (dev, 0x21, 255, 0, interface, 0, 0);
+  if (u)
+    return grub_error (GRUB_ERR_IO, "USB error %d", u);
+  return GRUB_ERR_NONE;
 }
 
 static void