From: Greg Kroah-Hartman Date: Thu, 29 Nov 2018 13:18:57 +0000 (+0100) Subject: fix up 4.4 and 4.9 xhci patch X-Git-Tag: v4.19.6~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e7ee1416ea4ea8f246b4047800cead2271b10b2;p=thirdparty%2Fkernel%2Fstable-queue.git fix up 4.4 and 4.9 xhci patch --- diff --git a/queue-4.4/usb-xhci-fix-uninitialized-completion-when-usb3-port-got-wrong-status.patch b/queue-4.4/usb-xhci-fix-uninitialized-completion-when-usb3-port-got-wrong-status.patch index 156f046d360..4f30432c105 100644 --- a/queue-4.4/usb-xhci-fix-uninitialized-completion-when-usb3-port-got-wrong-status.patch +++ b/queue-4.4/usb-xhci-fix-uninitialized-completion-when-usb3-port-got-wrong-status.patch @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman * out of the RExit state. */ - if (!DEV_SUPERSPEED_ANY(temp) && -+ if (!DEV_SUPERSPEED_ANY(portsc) && hcd->speed < HCD_USB3 && ++ if (!DEV_SUPERSPEED_ANY(temp) && hcd->speed < HCD_USB3 && test_and_clear_bit(faked_port_index, &bus_state->rexit_ports)) { complete(&bus_state->rexit_done[faked_port_index]); diff --git a/queue-4.9/usb-xhci-fix-uninitialized-completion-when-usb3-port-got-wrong-status.patch b/queue-4.9/usb-xhci-fix-uninitialized-completion-when-usb3-port-got-wrong-status.patch index 421f042a00f..9a1efcc8513 100644 --- a/queue-4.9/usb-xhci-fix-uninitialized-completion-when-usb3-port-got-wrong-status.patch +++ b/queue-4.9/usb-xhci-fix-uninitialized-completion-when-usb3-port-got-wrong-status.patch @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman * out of the RExit state. */ - if (!DEV_SUPERSPEED_ANY(temp) && -+ if (!DEV_SUPERSPEED_ANY(portsc) && hcd->speed < HCD_USB3 && ++ if (!DEV_SUPERSPEED_ANY(temp) && hcd->speed < HCD_USB3 && test_and_clear_bit(faked_port_index, &bus_state->rexit_ports)) { complete(&bus_state->rexit_done[faked_port_index]);