diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2016-10-26 15:33:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-26 15:33:07 +0200 |
commit | 1378f4a4d9908dd48dcf21ee526334d86344ec68 (patch) | |
tree | 1da1495f9fc9f046a169fb451ea5e6af13cc6453 /target/linux/mvebu/patches-3.18/700-usb_xhci_plat_phy_support.patch | |
parent | 2aefb514a4852f4c427b467150bbc7cdfe024528 (diff) | |
parent | 2c54d989b46284bc5ee5b43d4ba7c2762c2241ed (diff) | |
download | upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.gz upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.bz2 upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.zip |
Merge pull request #151 from wigyori/cc-dirtycow
CC: generic: bump kernel to 3.18.44
Diffstat (limited to 'target/linux/mvebu/patches-3.18/700-usb_xhci_plat_phy_support.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.18/700-usb_xhci_plat_phy_support.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-3.18/700-usb_xhci_plat_phy_support.patch b/target/linux/mvebu/patches-3.18/700-usb_xhci_plat_phy_support.patch index 3ee9f5c990..7631b6c5cd 100644 --- a/target/linux/mvebu/patches-3.18/700-usb_xhci_plat_phy_support.patch +++ b/target/linux/mvebu/patches-3.18/700-usb_xhci_plat_phy_support.patch @@ -8,7 +8,7 @@ #include <linux/slab.h> #include <linux/usb/xhci_pdriver.h> -@@ -158,12 +159,27 @@ static int xhci_plat_probe(struct platfo +@@ -161,12 +162,27 @@ static int xhci_plat_probe(struct platfo if (HCC_MAX_PSA(xhci->hcc_params) >= 4) xhci->shared_hcd->can_do_streams = 1; @@ -37,7 +37,7 @@ put_usb3_hcd: usb_put_hcd(xhci->shared_hcd); -@@ -187,6 +203,7 @@ static int xhci_plat_remove(struct platf +@@ -190,6 +206,7 @@ static int xhci_plat_remove(struct platf struct clk *clk = xhci->clk; usb_remove_hcd(xhci->shared_hcd); |