[patch] Proposed patch for genkernel

genkernel-usb-sleep.patch (text/plain), 1.12 KB, created by Xake on 2010-06-09 10:23:10 UTC

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index e0710c4..4c079a0 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -410,25 +410,14 @@ setup_hotplug() {
 	fi
 }
 
-check_slowusb() {
-	[ "${DO_slowusb}" ] || \
-	for dir in /sys/bus/usb/drivers/usb-storage/*
-	do
-		[ -d "${dir}" ] && FORCE_slowusb="1"
-	done
-}
-
 start_dev_mgr() {
 	if [ "${KV_2_6_OR_GREATER}" ]
 	then
 		cd /sys
 		[ "${DO_slowusb}" ] && sdelay
-		check_slowusb
-		[ "${FORCE_slowusb}" ] && sdelay
 		good_msg 'Activating mdev'
 		runmdev
-		[ "${DO_slowusb}" ] || \
-		[ "${FORCE_slowusb}" ] && sdelay
+		[ "${DO_slowusb}" ] && sdelay
 		cd /
 	fi
 }
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 0bf7316..a7bb906 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -287,7 +287,7 @@ else
 fi
 
 # Delay if needed for USB hardware
-sdelay
+[ "${DO_slowusb}" ] && sdelay
 
 # Start device manager
 start_dev_mgr
@@ -694,8 +694,7 @@ then
 	# Let Init scripts know that we booted from CD
 	export CDBOOT
 	CDBOOT=1
-	check_slowusb
-	if [ "${DO_slowusb}" ] || [ "${FORCE_slowusb}" ]
+	if [ "${DO_slowusb}" ]
 	then
 		sleep 10
 	fi