diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 12:55:09 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 12:55:09 -0800 |
| commit | 4f97f8f5f0664bdcfffe74e7d2a841f55a0e88e2 (patch) | |
| tree | 49165c5065d121130e0436e647b9a650f0da41cb /drivers/usb/core/hub.c | |
| parent | usb-misc: sisusbvga: fix error path (diff) | |
| parent | Linux 4.5-rc2 (diff) | |
| download | linux-4f97f8f5f0664bdcfffe74e7d2a841f55a0e88e2.tar.gz linux-4f97f8f5f0664bdcfffe74e7d2a841f55a0e88e2.zip | |
Merge 4.5-rc2 into usb-next
We want the USB fixes in here 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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 9ec5733b62f4..f912fe6bbc0b 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5457,7 +5457,6 @@ static int usb_reset_and_verify_device(struct usb_device *udev) } bos = udev->bos; - udev->bos = NULL; for (i = 0; i < SET_CONFIG_TRIES; ++i) { @@ -5550,8 +5549,11 @@ done: usb_set_usb2_hardware_lpm(udev, 1); usb_unlocked_enable_lpm(udev); usb_enable_ltm(udev); - usb_release_bos_descriptor(udev); - udev->bos = bos; + /* release the new BOS descriptor allocated by hub_port_init() */ + if (udev->bos != bos) { + usb_release_bos_descriptor(udev); + udev->bos = bos; + } return 0; re_enumerate: |