diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-11 10:28:12 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-11 10:28:21 +0200 |
| commit | 437a3a09e41f5f59971011f2fb514bffe606d211 (patch) | |
| tree | 6383b8e099572c03257e3bc2d3cb001a125f1420 /target/mips | |
| parent | 46f65db54aef60c5e2e8708e61ac513900963e96 (diff) | |
make pci_register work, revert 222831787704c9ad9215f6b56f975b233968607c
Diffstat (limited to 'target/mips')
| -rw-r--r-- | target/mips/mikrotik-rb532/patches/3.14.3/rb532-pci.patch | 26 | ||||
| -rw-r--r-- | target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch | 26 |
2 files changed, 52 insertions, 0 deletions
diff --git a/target/mips/mikrotik-rb532/patches/3.14.3/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.14.3/rb532-pci.patch new file mode 100644 index 000000000..c00453f36 --- /dev/null +++ b/target/mips/mikrotik-rb532/patches/3.14.3/rb532-pci.patch @@ -0,0 +1,26 @@ +diff -Nur linux-3.14.3.orig/arch/mips/pci/pci.c linux-3.14.3/arch/mips/pci/pci.c +--- linux-3.14.3.orig/arch/mips/pci/pci.c 2014-05-06 16:59:58.000000000 +0200 ++++ linux-3.14.3/arch/mips/pci/pci.c 2014-05-11 10:13:26.000000000 +0200 +@@ -166,20 +166,10 @@ + + void register_pci_controller(struct pci_controller *hose) + { +- struct resource *parent; +- +- parent = hose->mem_resource->parent; +- if (!parent) +- parent = &iomem_resource; +- +- if (request_resource(parent, hose->mem_resource) < 0) ++ if (request_resource(&iomem_resource, hose->mem_resource) < 0) + goto out; + +- parent = hose->io_resource->parent; +- if (!parent) +- parent = &ioport_resource; +- +- if (request_resource(parent, hose->io_resource) < 0) { ++ if (request_resource(&ioport_resource, hose->io_resource) < 0) { + release_resource(hose->mem_resource); + goto out; + } diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch new file mode 100644 index 000000000..73d977e08 --- /dev/null +++ b/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch @@ -0,0 +1,26 @@ +diff -Nur linux-3.15-rc5.orig/arch/mips/pci/pci.c linux-3.15-rc5/arch/mips/pci/pci.c +--- linux-3.15-rc5.orig/arch/mips/pci/pci.c 2014-05-09 22:10:52.000000000 +0200 ++++ linux-3.15-rc5/arch/mips/pci/pci.c 2014-05-10 21:18:58.000000000 +0200 +@@ -166,20 +166,10 @@ + + void register_pci_controller(struct pci_controller *hose) + { +- struct resource *parent; +- +- parent = hose->mem_resource->parent; +- if (!parent) +- parent = &iomem_resource; +- +- if (request_resource(parent, hose->mem_resource) < 0) ++ if (request_resource(&iomem_resource, hose->mem_resource) < 0) + goto out; + +- parent = hose->io_resource->parent; +- if (!parent) +- parent = &ioport_resource; +- +- if (request_resource(parent, hose->io_resource) < 0) { ++ if (request_resource(&ioport_resource, hose->io_resource) < 0) { + release_resource(hose->mem_resource); + goto out; + } |