summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2011-03-11 22:46:17 +0100
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-03-14 02:07:10 +0100
commit4814030ce11f08350b7a91573487ad4b600dae34 (patch)
treef0df7a6418a7f84173faf068b125ef673ff79e35 /drivers/usb
parentxhci: Remove references to HC_STATE_HALT. (diff)
downloadlinux-4814030ce11f08350b7a91573487ad4b600dae34.tar.xz
linux-4814030ce11f08350b7a91573487ad4b600dae34.zip
usb: Initialize hcd->state roothubs.
We would like to allow host controller drivers to stop using hcd->state. Unfortunately, some host controller drivers use hcd->state as an implicit way of telling the core that a controller has died. The roothub registration functions must assume the host died if hcd->state equals HC_STATE_HALT. To facilitate drivers that don't want to set hcd->state to HC_STATE_RUNNING in their initialization routines, we set the state to running before calling the host controller's start function. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/hcd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index b70db6e78977..a97ed6d293e9 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2347,6 +2347,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
(unsigned long long)hcd->rsrc_start);
}
+ hcd->state = HC_STATE_RUNNING;
retval = hcd->driver->start(hcd);
if (retval < 0) {
dev_err(hcd->self.controller, "startup error %d\n", retval);