block: fix bdi vs gendisk lifetime mismatch

[firefly-linux-kernel-4.4.55.git] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index b9a28074210f218e05383099b8c043d4ca9fff93..12891ffd4bf01be200b5366c6dd252b04c4c28e9 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -511,6 +511,8 @@ struct usb3_lpm_parameters {
  * @usb2_hw_lpm_enabled: USB2 hardware LPM is enabled
  * @usb2_hw_lpm_allowed: Userspace allows USB 2.0 LPM to be enabled
  * @usb3_lpm_enabled: USB3 hardware LPM enabled
+ * @usb3_lpm_u1_enabled: USB3 hardware U1 LPM enabled
+ * @usb3_lpm_u2_enabled: USB3 hardware U2 LPM enabled
  * @string_langid: language ID for strings
  * @product: iProduct string, if present (static)
  * @manufacturer: iManufacturer string, if present (static)
@@ -584,6 +586,8 @@ struct usb_device {
        unsigned usb2_hw_lpm_enabled:1;
        unsigned usb2_hw_lpm_allowed:1;
        unsigned usb3_lpm_enabled:1;
+       unsigned usb3_lpm_u1_enabled:1;
+       unsigned usb3_lpm_u2_enabled:1;
        int string_langid;
 
        /* static strings from the device */
@@ -1064,7 +1068,7 @@ struct usbdrv_wrap {
  *     for interfaces bound to this driver.
  * @soft_unbind: if set to 1, the USB core will not kill URBs and disable
  *     endpoints before calling the driver's disconnect method.
- * @disable_hub_initiated_lpm: if set to 0, the USB core will not allow hubs
+ * @disable_hub_initiated_lpm: if set to 1, the USB core will not allow hubs
  *     to initiate lower power link state transitions when an idle timeout
  *     occurs.  Device-initiated USB 3.0 link PM will still be allowed.
  *