aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorTrond Eivind Glomsrod <teg@redhat.com>2000-07-10 22:55:20 +0000
committerTrond Eivind Glomsrod <teg@redhat.com>2000-07-10 22:55:20 +0000
commit84f9e41eac9a8d6e1790fe4a700985949d281214 (patch)
tree46e4b1a78077e7a7a0bc59c729cd6fdaf75e8515 /rc.d
parent8f265d554ae80daa9d773479ce89735293354f97 (diff)
downloadinitscripts-84f9e41eac9a8d6e1790fe4a700985949d281214.tar
initscripts-84f9e41eac9a8d6e1790fe4a700985949d281214.tar.gz
initscripts-84f9e41eac9a8d6e1790fe4a700985949d281214.tar.bz2
initscripts-84f9e41eac9a8d6e1790fe4a700985949d281214.tar.xz
initscripts-84f9e41eac9a8d6e1790fe4a700985949d281214.zip
Don't try to initialize disabled (IRQwise) USB controller.
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/rc.sysinit5
1 files changed, 4 insertions, 1 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 563a3bc7..5e06d541 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -151,9 +151,12 @@ modprobe usb-controller 2>/dev/null || usb=0
if [ $usb == "0" ] ; then
usbpresent=`grep -i usb /proc/pci`
uhci=`grep -A2 -i usb /proc/pci |grep "I/O at"`
+
+ # Don't try to initialize disabled USB controllers
+ uhciirq=`grep -A1 -i usb /proc/pci |grep "IRQ"`
if [ -n "$usbpresent" ]; then
usb=1
- if [ -n "$uhci" ]; then
+ if [ -n "$uhci" ] && [ -n "$uhciirq" ] ; then
modprobe uhci 2>/dev/null || usb=0
else
modprobe usb-ohci 2>/dev/null || usb=0