diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2010-04-20 16:37:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 18:25:10 +0200 |
| commit | fcf7d2141f4a363a4a8454c4a0f26bb69e766c5f (patch) | |
| tree | 53a72787cba660277e072f094ce4447c335b37e9 /drivers/usb/host/ohci-hub.c | |
| parent | USB: don't choose configs with no interfaces (diff) | |
| download | linux-fcf7d2141f4a363a4a8454c4a0f26bb69e766c5f.tar.xz linux-fcf7d2141f4a363a4a8454c4a0f26bb69e766c5f.zip | |
USB: OHCI: don't look at the root hub to get the number of ports
This patch (as1371) fixes a small bug in ohci-hcd. The HCD already
knows how many ports the controller has; there's no need to go looking
at the root hub's usb_device structure to find out. Especially since
the root hub's maxchild value is set correctly only while the root hub
is bound to the hub driver.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ohci-hub.c')
| -rw-r--r-- | drivers/usb/host/ohci-hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c index 32bbce9718f0..65cac8cc8921 100644 --- a/drivers/usb/host/ohci-hub.c +++ b/drivers/usb/host/ohci-hub.c @@ -697,7 +697,7 @@ static int ohci_hub_control ( u16 wLength ) { struct ohci_hcd *ohci = hcd_to_ohci (hcd); - int ports = hcd_to_bus (hcd)->root_hub->maxchild; + int ports = ohci->num_ports; u32 temp; int retval = 0; |