diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-11-01 13:48:26 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-11-01 13:48:26 +0000 |
| commit | 2f99e562e03487b927782fcd0f690346d71c34e1 (patch) | |
| tree | 0e0299593a79411fc54596a60bcc0b05db458703 /target/linux/bcm53xx/patches-3.18 | |
| parent | 0625aaa6f37dcf6a2ffb611245fa9b6477642b78 (diff) | |
| download | upstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.gz upstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.bz2 upstream-2f99e562e03487b927782fcd0f690346d71c34e1.zip | |
CC: kernel: update kernel 3.18 to version 3.18.23
Changelog:
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23
backport of r47334.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18')
2 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/070-ARM-BCM5301X-add-NAND-flash-chip-description-for-Asu.patch b/target/linux/bcm53xx/patches-3.18/070-ARM-BCM5301X-add-NAND-flash-chip-description-for-Asu.patch index 07393ad3dc..afc8fe90c0 100644 --- a/target/linux/bcm53xx/patches-3.18/070-ARM-BCM5301X-add-NAND-flash-chip-description-for-Asu.patch +++ b/target/linux/bcm53xx/patches-3.18/070-ARM-BCM5301X-add-NAND-flash-chip-description-for-Asu.patch @@ -21,8 +21,6 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts -index aedf3c4..8ade7de 100644 --- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts @@ -10,6 +10,7 @@ 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 d459520d3f..05835df0da 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 @@ -90,5 +90,5 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> +#endif /* CONFIG_ARCH_BCM_5301X */ + if (!ret) - xhci->xhc_state &= ~XHCI_STATE_HALTED; - return ret; + xhci->xhc_state &= ~(XHCI_STATE_HALTED | XHCI_STATE_DYING); + |