diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 10:59:16 +0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 11:01:16 +0400 |
| commit | d0d5864676dbccfb1337864a0ae6ce97e6342678 (patch) | |
| tree | 7caa674ec05a1797054cd4304f0a047b6dacddd6 /drivers/usb/core/hub.h | |
| parent | 6534e6809e6c9d48114b537afe03bee3fd33bf01 (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
| download | linux-d0d5864676dbccfb1337864a0ae6ce97e6342678.tar.xz | |
Merge tag 'v3.16-rc6' into MTD development branch
Linux 3.16-rc6
Diffstat (limited to 'drivers/usb/core/hub.h')
| -rw-r--r-- | drivers/usb/core/hub.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h index 0a7cdc0ef0a9..326308e53961 100644 --- a/drivers/usb/core/hub.h +++ b/drivers/usb/core/hub.h @@ -84,6 +84,7 @@ struct usb_hub { * @dev: generic device interface * @port_owner: port's owner * @peer: related usb2 and usb3 ports (share the same connector) + * @req: default pm qos request for hubs without port power control * @connect_type: port's connect type * @location: opaque representation of platform connector location * @status_lock: synchronize port_event() vs usb_port_{suspend|resume} @@ -95,6 +96,7 @@ struct usb_port { struct device dev; struct usb_dev_state *port_owner; struct usb_port *peer; + struct dev_pm_qos_request *req; enum usb_port_connect_type connect_type; usb_port_location_t location; struct mutex status_lock; |