summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-ppc-of.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-23 22:32:51 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-23 22:32:51 +0200
commitc04ee4b1136e462722567cf6e76bb35a181574a7 (patch)
tree58dbc5ad8be3e1eae398ee463f8a11ac84662487 /drivers/usb/host/ehci-ppc-of.c
parentMerge branch 'master' into usb-next (diff)
downloadlinux-c04ee4b1136e462722567cf6e76bb35a181574a7.tar.xz
linux-c04ee4b1136e462722567cf6e76bb35a181574a7.zip
Revert "Revert "USB: EHCI: support running URB giveback in tasklet context""
This reverts commit 3b8d7321ed4b8511e17048303b806ffcc2806077, which brings back commit 428aac8a81058e2303677a8fbf26670229e51d3a 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-ppc-of.c')
-rw-r--r--drivers/usb/host/ehci-ppc-of.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 932293fa32de..6cc5567bf9c8 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -28,7 +28,7 @@ static const struct hc_driver ehci_ppc_of_hc_driver = {
* generic hardware linkage
*/
.irq = ehci_irq,
- .flags = HCD_MEMORY | HCD_USB2,
+ .flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
/*
* basic lifecycle operations