On Thursday 24 January 2008, Chuck Ebbert wrote:
> On 01/23/2008 06:38 PM, David Brownell wrote:
> > On Wednesday 23 January 2008, Chuck Ebbert wrote:
> >> Make the EHCI host driver respect the "nousb" kernel option.
> >>
> >> Signed-off-by: Chuck Ebbert <[EMAIL PROTECTED]>
> > 
> > You know, given my druthers we'd have the HCD registration
> > check this, rather than updating every HCD's setup logic...
> > 
> > Care to try a maximally generic fix instead?  :)
> > 
> 
> Sorry, I don't have the time to figure out how that works.
> This one seemed to be the only one missing the test of
> usb_disabled() anyway (I copied the code from one of
> the other ones.)

It would look not dissimilar to this ... there could be a
followup patch removing this test from every HCD's probe().

- Dave


==== CUT HERE
Rather than requiring every HCD to test for usb_disabled(),
we can have one test the HCD registration path.  Among other
things this will also make it easier to test some of the
fault paths during HCD setup.

Signed-off-by: David Brownell <[EMAIL PROTECTED]>
---
 drivers/usb/core/hcd.c |    3 +++
 1 file changed, 3 insertions(+)

--- g26.orig/drivers/usb/core/hcd.c     2008-02-09 19:19:39.000000000 -0800
+++ g26/drivers/usb/core/hcd.c  2008-02-09 19:20:06.000000000 -0800
@@ -877,6 +877,9 @@ static int register_root_hub(struct usb_
        const int devnum = 1;
        int retval;
 
+       if (usb_disabled())
+               return -ENODEV;
+
        usb_dev->devnum = devnum;
        usb_dev->bus->devnum_next = devnum + 1;
        memset (&usb_dev->bus->devmap.devicemap, 0,

-
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to