diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2013-05-28 10:55:09 +0800 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-05-28 11:09:16 -0600 |
| commit | ea221e64140f6fa543c29e31349001167b9f8ad0 (patch) | |
| tree | d1540937f902e3383e7ecba615ed0e9efcb7e080 | |
| parent | bb5c2de268f0d01fb3bb7683037d9b2bebcba3d5 (diff) | |
| download | op-kernel-dev-ea221e64140f6fa543c29e31349001167b9f8ad0.zip op-kernel-dev-ea221e64140f6fa543c29e31349001167b9f8ad0.tar.gz | |
x86/PCI: Increase info->res_num before checking pci_use_crs
We should increase info->res_num before we checking pci_use_crs return
when pci=nocrs set.
No functional change, since we don't use res_num and res_offset[]
in the "!pci_use_crs" case anyway, but this makes the code read better.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.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>
| -rw-r--r-- | arch/x86/pci/acpi.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 3e72425..d641897 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; } |
