On Tue, Oct 19, 2004 at 07:48:34PM -0700, Matthew Dharm wrote:
> On Mon, Oct 18, 2004 at 06:52:47PM -0700, David Brownell wrote:
> > On Monday 18 October 2004 12:52 pm, Matthew Dharm wrote:
> > 
> > > How does this look?  It seems to work for me.
> > 
> > Looks OK to me.  I'll put it in my tree and send it along later,
> > when the queues get unblocked.  Thanks!
> 
> Of course, I borked the patch... needed a == instead of = when testing the
> device value.
> 
> Here's the fixed patch.

I. Am. A. Moron.

I borked the patch again.  This time, I had the wrong vendor ID in there.

This time, for real, is the right patch.

Signed-off-by: Matthew Dharm <[EMAIL PROTECTED]>

Matt


===== drivers/usb/host/ehci-hcd.c 1.85 vs edited =====
--- 1.85/drivers/usb/host/ehci-hcd.c    2004-10-11 14:21:59 -07:00
+++ edited/drivers/usb/host/ehci-hcd.c  2004-10-20 15:52:25 -07:00
@@ -348,9 +348,17 @@
 
 #ifdef CONFIG_PCI
        /* EHCI 0.96 and later may have "extended capabilities" */
-       if (hcd->self.controller->bus == &pci_bus_type)
+       if (hcd->self.controller->bus == &pci_bus_type) {
+               struct pci_dev* pdev = to_pci_dev(ehci->hcd.self.controller);
                temp = HCC_EXT_CAPS (readl (&ehci->caps->hcc_params));
-       else
+
+               /* AMD8111 EHCI doesn't work according to AMD errata */
+               if ((pdev->vendor == PCI_VENDOR_ID_AMD) &&
+                               (pdev->device == 0x7463)) {
+                       ehci_info (ehci, "rejecting AMD8111 for known bugs\n");
+                       return -EIO;
+               }
+       } else
                temp = 0;
        while (temp && count--) {
                u32             cap;

-- 
Matthew Dharm                              Home: [EMAIL PROTECTED] 
Maintainer, Linux USB Mass Storage Driver

NYET! The evil stops here!
                                        -- Pitr
User Friendly, 6/22/1998

Attachment: pgpEFih0E7d8S.pgp
Description: PGP signature

Reply via email to