diff options
| author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2010-12-02 14:45:18 -0800 |
|---|---|---|
| committer | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2011-03-13 18:07:15 -0700 |
| commit | 83de4b2b90887b5b317d8313864fe4cc5db35280 (patch) | |
| tree | e2eccac30913261d660be034e8f53a6640061738 /include/linux/usb | |
| parent | d673bfcbfffdeb56064a6b1ee047b85590bed76c (diff) | |
| download | linux-stable-83de4b2b90887b5b317d8313864fe4cc5db35280.tar.gz linux-stable-83de4b2b90887b5b317d8313864fe4cc5db35280.tar.bz2 linux-stable-83de4b2b90887b5b317d8313864fe4cc5db35280.zip | |
usb: Store bus type in usb_hcd, not in driver flags.
The xHCI driver essentially has both a USB 2.0 and a USB 3.0 roothub. So
setting the HCD_USB3 bits in the hcd->driver->flags is a bit misleading.
Add a new field to usb_hcd, bcdUSB. Store the result of
hcd->driver->flags & HCD_MASK in it. Later, when we have the xHCI driver
register the two roothubs, we'll set the usb_hcd->bcdUSB field to HCD_USB2
for the USB 2.0 roothub, and HCD_USB3 for the USB 3.0 roothub.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/hcd.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index 836aaa91ee15..b8bb6934f30b 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -76,6 +76,10 @@ struct usb_hcd { struct kref kref; /* reference counter */ const char *product_desc; /* product/vendor string */ + int speed; /* Speed for this roothub. + * May be different from + * hcd->driver->flags & HCD_MASK + */ char irq_descr[24]; /* driver + bus # */ struct timer_list rh_timer; /* drives root-hub polling */ |