From a3430152ca6c67bd3fd88e292eefba6a48b6408a Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Mon, 23 Apr 2012 10:08:51 -0700 Subject: [PATCH] --- yaml --- r: 303992 b: refs/heads/master c: 8afa408cba5c474696df6307a64b1c612bbcadbc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/usb.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 25de90cade88..a82461bebf7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51e0a01206613ad80a3841388ecfa46476dabdf5 +refs/heads/master: 8afa408cba5c474696df6307a64b1c612bbcadbc diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index e6c815590fdd..22e7b53123ef 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -879,6 +879,9 @@ 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 + * to initiate lower power link state transitions when an idle timeout + * occurs. Device-initiated USB 3.0 link PM will still be allowed. * * USB interface drivers must provide a name, probe() and disconnect() * methods, and an id_table. Other driver fields are optional. @@ -919,6 +922,7 @@ struct usb_driver { struct usbdrv_wrap drvwrap; unsigned int no_dynamic_id:1; unsigned int supports_autosuspend:1; + unsigned int disable_hub_initiated_lpm:1; unsigned int soft_unbind:1; }; #define to_usb_driver(d) container_of(d, struct usb_driver, drvwrap.driver)