diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 21:15:16 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 21:15:16 +0300 |
commit | 722b262c966a388a1f8bfcdd100cd19c4ce59ab9 (patch) | |
tree | 34e755b07dbca16f65ad7eb5bb1fade06032cebf /drivers/usb/core/hub.c | |
parent | 4e02bea82b4e6c1eebeac6e6f4ecb93e9c2aa8c0 (diff) | |
parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
download | linux-722b262c966a388a1f8bfcdd100cd19c4ce59ab9.tar.xz |
Merge 4.2-rc4 into usb-next
We want the USB fixes that went into that release in this branch as
well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/hub.c')
-rw-r--r-- | drivers/usb/core/hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index d9ce8f9d9acc..917c27c4675a 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -122,7 +122,7 @@ struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev) return usb_get_intfdata(hdev->actconfig->interface[0]); } -static int usb_device_supports_lpm(struct usb_device *udev) +int usb_device_supports_lpm(struct usb_device *udev) { /* USB 2.1 (and greater) devices indicate LPM support through * their USB 2.0 Extended Capabilities BOS descriptor. |