| Message ID | 1367053949-38424-2-git-send-email-wangyijing@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 3e72425..662dfdf 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -324,14 +324,11 @@ setup_resource(struct acpi_resource *acpi_res, void *data) res->start = start; res->end = end; info->res_offset[info->res_num] = addr.translation_offset; + info->res_num++; - if (!pci_use_crs) { + if (!pci_use_crs) dev_printk(KERN_DEBUG, &info->bridge->dev, "host bridge window %pR (ignored)\n", res); - return AE_OK; - } - - info->res_num++; return AE_OK; }
We should increase info->res_num before checking pci_use_crs return, otherwise only the res[0] of pci_root_info will be used during setup_resource() when pci=nocrs set. And the old resource value will be overwritten by new resource item. Signed-off-by: Yijing Wang <wangyijing@huawei.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Jiang Liu <liuj97@gmail.com> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> Cc: Feng Tang <feng.tang@intel.com> --- arch/x86/pci/acpi.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)