Merge pull request #1281 from tlaurion/usb_modules_load_order_fix

linuxboot · Jan 17, 2023 · e45980d · e45980d
2 parents db5777a + 256313a
commit e45980d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/initrd/etc/functions b/initrd/etc/functions
@@ -93,6 +93,11 @@ confirm_totp()
 
 enable_usb()
 {
+	#insmod ehci_hcd prior of uhdc_hcd and ohci_hcd to suppress dmesg warning 
+	if ! lsmod | grep -q ehci_hcd; then
+                insmod /lib/modules/ehci-hcd.ko \
+                || die "ehci_hcd: module load failed"
+        fi
 	if [ "$CONFIG_LINUX_USB_COMPANION_CONTROLLER" = y ]; then
 		if ! lsmod | grep -q uhci_hcd; then
 			insmod /lib/modules/uhci-hcd.ko \
@@ -107,10 +112,6 @@ enable_usb()
 			|| die "ohci_pci: module load failed"
 		fi
 	fi
-	if ! lsmod | grep -q ehci_hcd; then
-		insmod /lib/modules/ehci-hcd.ko \
-		|| die "ehci_hcd: module load failed"
-	fi
 	if ! lsmod | grep -q ehci_pci; then
 		insmod /lib/modules/ehci-pci.ko \
 		|| die "ehci_pci: module load failed"