aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-30 23:26:09 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-30 23:26:09 +0000
commit901a7fa067c63a81eda14becfffa1bbd79009e33 (patch)
tree6d0baf583d89eec283789e912136ad8de58f42d4 /target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch
parentad80d3869dd67d8e71581f7e0028bb0238901fda (diff)
downloadupstream-901a7fa067c63a81eda14becfffa1bbd79009e33.tar.gz
upstream-901a7fa067c63a81eda14becfffa1bbd79009e33.tar.bz2
upstream-901a7fa067c63a81eda14becfffa1bbd79009e33.zip
kernel: update 3.18 to 3.18.17
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46150
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch b/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch
index 87d23c3a51..d459520d3f 100644
--- a/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch
+++ b/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch
@@ -14,8 +14,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/usb/host/xhci.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 3bceabe..0737ab2 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -122,6 +122,64 @@ int xhci_halt(struct xhci_hcd *xhci)
@@ -83,7 +81,7 @@ index 3bceabe..0737ab2 100644
/*
* Set the run bit and wait for the host to be running.
*/
-@@ -146,6 +204,10 @@ static int xhci_start(struct xhci_hcd *xhci)
+@@ -146,6 +204,10 @@ static int xhci_start(struct xhci_hcd *x
xhci_err(xhci, "Host took too long to start, "
"waited %u microseconds.\n",
XHCI_MAX_HALT_USEC);
@@ -94,6 +92,3 @@ index 3bceabe..0737ab2 100644
if (!ret)
xhci->xhc_state &= ~XHCI_STATE_HALTED;
return ret;
---
-1.8.4.5
-