Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2 files changed, 20 insertions, 11 deletions

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index e9e5bc178cef..9e81c26313f9 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -191,8 +191,9 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
                 }
                 if (wait_time <= 0)
                         printk(KERN_WARNING "%s %s: BIOS handoff "
-                                        "failed (BIOS bug ?)\n",
-                                        pdev->dev.bus_id, "OHCI");
+                                        "failed (BIOS bug ?) %08x\n",
+                                        pdev->dev.bus_id, "OHCI",
+                                        readl(base + OHCI_CONTROL));
 
                 /* reset controller, preserving RWC */
                 writel(control & OHCI_CTRL_RWC, base + OHCI_CONTROL);
@@ -243,6 +244,12 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
                                 pr_debug("%s %s: BIOS handoff\n",
                                                 pdev->dev.bus_id, "EHCI");
 
+#if 0
+/* aleksey_gorelov@phoenix.com reports that some systems need SMI forced on,
+ * but that seems dubious in general (the BIOS left it off intentionally)
+ * and is known to prevent some systems from booting.  so we won't do this
+ * unless maybe we can determine when we're on a system that needs SMI forced.
+ */
                                 /* BIOS workaround (?): be sure the
                                  * pre-Linux code receives the SMI
                                  */
@@ -252,12 +259,14 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
                                 pci_write_config_dword(pdev,
                                                 offset + EHCI_USBLEGCTLSTS,
                                                 val | EHCI_USBLEGCTLSTS_SOOE);
-                        }
+#endif
 
-                        /* always say Linux will own the hardware
-                         * by setting EHCI_USBLEGSUP_OS.
-                         */
-                        pci_write_config_byte(pdev, offset + 3, 1);
+                                /* some systems get upset if this semaphore is
+                                 * set for any other reason than forcing a BIOS
+                                 * handoff..
+                                 */
+                                pci_write_config_byte(pdev, offset + 3, 1);
+                        }
 
                         /* if boot firmware now owns EHCI, spin till
                          * it hands it over.
@@ -274,8 +283,8 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
                                  * it down, and hope nothing goes too wrong
                                  */
                                 printk(KERN_WARNING "%s %s: BIOS handoff "
-                                                "failed (BIOS bug ?)\n",
-                                        pdev->dev.bus_id, "EHCI");
+                                                "failed (BIOS bug ?) %08x\n",
+                                        pdev->dev.bus_id, "EHCI", cap);
                                 pci_write_config_byte(pdev, offset + 2, 0);
                         }
 
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 466384d7c79f..134d2000128a 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -101,7 +101,7 @@ static struct resource resources[] = {
         },
 };
 
-extern struct device_driver sl811h_driver;
+extern struct platform_driver sl811h_driver;
 
 static struct platform_device platform_dev = {
         .id                     = -1,
@@ -132,7 +132,7 @@ static int sl811_hc_init(struct device *parent, ioaddr_t base_addr, int irq)
          * initialized already because of the link order dependency created
          * by referencing "sl811h_driver".
          */
-        platform_dev.name = sl811h_driver.name;
+        platform_dev.name = sl811h_driver.driver.name;
         return platform_device_register(&platform_dev);
 }