Commit ea221e64 authored May 28, 2013 by Yijing Wang Committed by Bjorn Helgaas May 28, 2013

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>

parent bb5c2de2

arch/x86/pci/acpi.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}