grub2/0147-grub-core-bus-usb-usb.c-grub_usb_device_attach-Add-m.patch
Peter Jones f74b50e380 Rebase to upstream, fix a pile of bugs. The usual.
Signed-off-by: Peter Jones <pjones@redhat.com>
2013-06-12 15:37:08 -04:00

53 lines
1.4 KiB
Diff

From 3ebe52d52ce44412edb87037d4d7378b04a3ad17 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 1 Feb 2013 21:43:49 +0100
Subject: [PATCH 147/482] * grub-core/bus/usb/usb.c
(grub_usb_device_attach): Add missing grub_print_error.
---
ChangeLog | 5 +++++
grub-core/bus/usb/usb.c | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 7bae470..26702c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-02-01 Vladimir Serbinenko <phcoder@gmail.com>
+ * grub-core/bus/usb/usb.c (grub_usb_device_attach): Add missing
+ grub_print_error.
+
+2013-02-01 Vladimir Serbinenko <phcoder@gmail.com>
+
* grub-core/bus/usb/serial/common.c (grub_usbserial_attach): Fix missing
zero-out of port structure.
diff --git a/grub-core/bus/usb/usb.c b/grub-core/bus/usb/usb.c
index 6fbf134..5df08e9 100644
--- a/grub-core/bus/usb/usb.c
+++ b/grub-core/bus/usb/usb.c
@@ -297,14 +297,18 @@ void grub_usb_device_attach (grub_usb_device_t dev)
{
case GRUB_USB_CLASS_MASS_STORAGE:
grub_dl_load ("usbms");
+ grub_print_error ();
break;
case GRUB_USB_CLASS_HID:
grub_dl_load ("usb_keyboard");
+ grub_print_error ();
break;
case 0xff:
/* FIXME: don't load useless modules. */
grub_dl_load ("usbserial_ftdi");
+ grub_print_error ();
grub_dl_load ("usbserial_pl2303");
+ grub_print_error ();
break;
}
}
--
1.8.2.1