public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jon Smirl <jonsmirl@gmail.com>
To: lkml <linux-kernel@vger.kernel.org>
Subject: 2.6.9-rc3-mm1, bk-pci patch, USB hubs
Date: Sun, 3 Oct 2004 14:33:48 -0400	[thread overview]
Message-ID: <9e473391041003113351c6e237@mail.gmail.com> (raw)

These changes make the USB hub module fail to load. I get a trap in
kmem_cache_alloc called from uhci_alloc_urb_private. Reverting them
fixes it.

diff -Nru a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
--- a/drivers/usb/host/ehci-hcd.c       2004-10-03 14:22:49 -04:00
+++ b/drivers/usb/host/ehci-hcd.c       2004-10-03 14:22:49 -04:00
@@ -1092,7 +1092,7 @@
                sizeof (struct ehci_qh), sizeof (struct ehci_qtd),
                sizeof (struct ehci_itd), sizeof (struct ehci_sitd));

-       return pci_module_init (&ehci_pci_driver);
+       return pci_register_driver (&ehci_pci_driver);
 }
 module_init (init);

diff -Nru a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
--- a/drivers/usb/host/ohci-pci.c       2004-10-03 14:22:49 -04:00
+++ b/drivers/usb/host/ohci-pci.c       2004-10-03 14:22:49 -04:00
@@ -279,7 +279,7 @@

        pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name,
                sizeof (struct ed), sizeof (struct td));
-       return pci_module_init (&ohci_pci_driver);
+       return pci_register_driver (&ohci_pci_driver);
 }
 module_init (ohci_hcd_pci_init);

diff -Nru a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
--- a/drivers/usb/host/uhci-hcd.c       2004-10-03 14:22:49 -04:00
+++ b/drivers/usb/host/uhci-hcd.c       2004-10-03 14:22:49 -04:00
@@ -2534,7 +2534,7 @@
        if (!uhci_up_cachep)
                goto up_failed;

-       retval = pci_module_init(&uhci_pci_driver);
+       retval = pci_register_driver(&uhci_pci_driver);
        if (retval)
                goto init_failed;


-- 
Jon Smirl
jonsmirl@gmail.com

             reply	other threads:[~2004-10-03 18:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-10-03 18:33 Jon Smirl [this message]
2004-10-04 22:11 ` 2.6.9-rc3-mm1, bk-pci patch, USB hubs Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2004-10-03 19:02 Hanno Meyer-Thurow
2004-10-03 19:07 ` Jon Smirl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9e473391041003113351c6e237@mail.gmail.com \
    --to=jonsmirl@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox