diff options
| author | Mathias Kresin <dev@kresin.me> | 2017-03-25 12:18:56 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-04-08 14:30:00 +0200 |
| commit | 136718a3d91bb392de8bc04d9fd59d86b4f460c0 (patch) | |
| tree | ae53b82cae09b4b760ddb26aaa97a34cbfec0bff /target/linux/lantiq/patches-4.9 | |
| parent | 813efe57e434037fb58bd3e16ebd3a1cfd6ceb82 (diff) | |
| download | upstream-136718a3d91bb392de8bc04d9fd59d86b4f460c0.tar.gz upstream-136718a3d91bb392de8bc04d9fd59d86b4f460c0.tar.bz2 upstream-136718a3d91bb392de8bc04d9fd59d86b4f460c0.zip | |
kernel: update MIPS pci fix to the accepted version
Fix the list order instead of adjusting the controller scan order.
Revert the former required changes to the lantiq PCIe driver.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/lantiq/patches-4.9')
| -rw-r--r-- | target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch index 16d3f558bc..59d29d838b 100644 --- a/target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch @@ -4143,7 +4143,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + --- a/arch/mips/pci/pci-legacy.c +++ b/arch/mips/pci/pci-legacy.c -@@ -300,3 +300,31 @@ char *__init pcibios_setup(char *str) +@@ -300,3 +300,30 @@ char *__init pcibios_setup(char *str) return pcibios_plat_setup(str); return str; } @@ -4164,8 +4164,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + int bus_nr = 0; + struct pci_controller *hose; + -+ if (!list_empty(&controllers)) -+ hose = list_last_entry(&controllers, struct pci_controller, list); ++ hose = list_first_entry_or_null(&controllers, struct pci_controller, list); + + if (hose != NULL) { + if (hose->bus != NULL) { |