diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:51:34 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:51:34 +0000 |
commit | 418c28764024a6ecf6bbd66315de6df006ac037a (patch) | |
tree | 690c030be8e2625c2409b5515a09d85d276d17f9 /target/linux/mediatek | |
parent | c7377ba3fe9346b407140d0f5e7f33158cbcd301 (diff) | |
download | master-187ad058-418c28764024a6ecf6bbd66315de6df006ac037a.tar.gz master-187ad058-418c28764024a6ecf6bbd66315de6df006ac037a.tar.bz2 master-187ad058-418c28764024a6ecf6bbd66315de6df006ac037a.zip |
kernel/4.1: update to version 4.1.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48223 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mediatek')
-rw-r--r-- | target/linux/mediatek/patches/0047-xhci-mediatek-support-MTK-xHCI-host-controller.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mediatek/patches/0047-xhci-mediatek-support-MTK-xHCI-host-controller.patch b/target/linux/mediatek/patches/0047-xhci-mediatek-support-MTK-xHCI-host-controller.patch index 135ac63e89..55e340d74f 100644 --- a/target/linux/mediatek/patches/0047-xhci-mediatek-support-MTK-xHCI-host-controller.patch +++ b/target/linux/mediatek/patches/0047-xhci-mediatek-support-MTK-xHCI-host-controller.patch @@ -784,7 +784,7 @@ Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> #define DRIVER_AUTHOR "Sarah Sharp" #define DRIVER_DESC "'eXtensible' Host Controller (xHC) Driver" -@@ -624,7 +625,11 @@ int xhci_run(struct usb_hcd *hcd) +@@ -634,7 +635,11 @@ int xhci_run(struct usb_hcd *hcd) "// Set the interrupt modulation register"); temp = readl(&xhci->ir_set->irq_control); temp &= ~ER_IRQ_INTERVAL_MASK; @@ -797,7 +797,7 @@ Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> writel(temp, &xhci->ir_set->irq_control); /* Set the HCD state before we enable the irqs */ -@@ -1698,6 +1703,9 @@ int xhci_drop_endpoint(struct usb_hcd *h +@@ -1708,6 +1713,9 @@ int xhci_drop_endpoint(struct usb_hcd *h xhci_endpoint_zero(xhci, xhci->devs[udev->slot_id], ep); @@ -807,7 +807,7 @@ Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> xhci_dbg(xhci, "drop ep 0x%x, slot id %d, new drop flags = %#x, new add flags = %#x\n", (unsigned int) ep->desc.bEndpointAddress, udev->slot_id, -@@ -1793,6 +1801,12 @@ int xhci_add_endpoint(struct usb_hcd *hc +@@ -1803,6 +1811,12 @@ int xhci_add_endpoint(struct usb_hcd *hc return -ENOMEM; } |