Re: [linux-usb-devel] [PATCH] proper bios handoff in ehci-hcd

[Olaf Hering <olh@suse.de>]

 On Tue, Jul 13, David Brownell wrote:

> Instead, how about:  (a) longer timeout, 5 seconds to match OHCI's
> absurdly long default there; (b) change that "handoff failed" message
> to add "continuing anyway"; and (c) return 0 as you do, which I'm
> expecting is the key part of that patch.

This patch works for me:

diff -purN linux-2.6.8-rc1-bk3.bios-handoff/drivers/usb/host/ehci-hcd.c linux-2.6.8-rc1-bk3/drivers/usb/host/ehci-hcd.c
--- linux-2.6.8-rc1-bk3.bios-handoff/drivers/usb/host/ehci-hcd.c	2004-07-15 11:24:14.000000000 +0200
+++ linux-2.6.8-rc1-bk3/drivers/usb/host/ehci-hcd.c	2004-07-15 11:32:28.463930957 +0200
@@ -303,9 +303,11 @@ static int bios_handoff (struct ehci_hcd
 			pci_read_config_dword(pdev, where, &cap);
 		} while ((cap & (1 << 16)) && msec);
 		if (cap & (1 << 16)) {
-			ehci_err (ehci, "BIOS handoff failed (%d, %04x)\n",
+			ehci_err (ehci, "BIOS handoff failed (%d, %04x)\n"
+				" Devices connected to this controller will not work correctly.\n"
+				" Complain to your BIOS vendor.\n", /* Really! */
 				where, cap);
-			return 1;
+			return 0;
 		} 
 		ehci_dbg (ehci, "BIOS handoff succeeded\n");
 	}

-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, nÜRNBERG