Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c04ee4b1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "Revert "USB: EHCI: support running URB giveback in tasklet context"" 



This reverts commit 3b8d7321, which
brings back commit 428aac8a as it should
be working for the 3.13-rc1 merge window now that Alan's other fixes are
here in the tree already.

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Ming Lei <ming.lei@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc4fea79

drivers/usb/host/ehci-fsl.c

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ static const struct hc_driver ehci_fsl_hc_driver = { 
	 * generic hardware linkage

	 */

	.irq = ehci_irq,

	.flags = HCD_USB2 | HCD_MEMORY,

	.flags = HCD_USB2 | HCD_MEMORY | HCD_BH,



	/*

	 * basic lifecycle operations

drivers/usb/host/ehci-grlib.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static const struct hc_driver ehci_grlib_hc_driver = { 
	 * generic hardware linkage

	 */

	.irq			= ehci_irq,

	.flags			= HCD_MEMORY | HCD_USB2,

	.flags			= HCD_MEMORY | HCD_USB2 | HCD_BH,



	/*

	 * basic lifecycle operations

drivers/usb/host/ehci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ static const struct hc_driver ehci_hc_driver = { 
	 * generic hardware linkage

	 */

	.irq =			ehci_irq,

	.flags =		HCD_MEMORY | HCD_USB2,

	.flags =		HCD_MEMORY | HCD_USB2 | HCD_BH,



	/*

	 * basic lifecycle operations

drivers/usb/host/ehci-mv.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static const struct hc_driver mv_ehci_hc_driver = { 
	 * generic hardware linkage

	 */

	.irq = ehci_irq,

	.flags = HCD_MEMORY | HCD_USB2,

	.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,



	/*

	 * basic lifecycle operations

drivers/usb/host/ehci-octeon.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static const struct hc_driver ehci_octeon_hc_driver = { 
	 * generic hardware linkage

	 */

	.irq			= ehci_irq,

	.flags			= HCD_MEMORY | HCD_USB2,

	.flags			= HCD_MEMORY | HCD_USB2 | HCD_BH,



	/*

	 * basic lifecycle operations