rpms/kernel/devel linux-2.6-usb-ehci-hcd-respect-nousb.patch, NONE, 1.1 kernel.spec, 1.376, 1.377

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3639

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-usb-ehci-hcd-respect-nousb.patch 
Log Message:
* Wed Jan 23 2008 Chuck Ebbert <cebbert at redhat.com>
- Make the USB EHCI driver repect the "nousb" parameter. (F8#429863)


linux-2.6-usb-ehci-hcd-respect-nousb.patch:

--- NEW FILE linux-2.6-usb-ehci-hcd-respect-nousb.patch ---
Make the EHCI host driver respect the "nousb" kernel option.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

---
 drivers/usb/host/ehci-hcd.c |    3 +++
 1 file changed, 3 insertions(+)

--- linux-2.6.23.noarch.orig/drivers/usb/host/ehci-hcd.c
+++ linux-2.6.23.noarch/drivers/usb/host/ehci-hcd.c
@@ -973,6 +973,9 @@ static int __init ehci_hcd_init(void)
 {
 	int retval = 0;
 
+	if (usb_disabled())
+		return -ENODEV;
+
 	pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n",
 		 hcd_name,
 		 sizeof(struct ehci_qh), sizeof(struct ehci_qtd),


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- kernel.spec	23 Jan 2008 03:35:14 -0000	1.376
+++ kernel.spec	23 Jan 2008 19:26:34 -0000	1.377
@@ -657,6 +657,9 @@
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-increase-login-orb-timeout.patch
 
+# make USB EHCI driver respect "nousb" parameter
+Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1049,7 +1052,7 @@
 #
 # bugfixes to drivers and filesystems
 #
-
+ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1747,6 +1750,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Wed Jan 23 2008 Chuck Ebbert <cebbert at redhat.com>
+- Make the USB EHCI driver repect the "nousb" parameter. (F8#429863)
+
 * Tue Jan 22 2008 John W. Linville <linville at redhat.com>
 - Latest wireless updates from upstream
 - Tidy-up wireless patches