---

yaml
---
r: 294735
b: refs/heads/master
c: 0c5be0c
h: refs/heads/master
i:
  294733: 521d3d0
  294731: 946316f
  294727: 47b572e
  294719: 9a29af6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 823806ff6bd63f92644a5330cf0c3b68fac25ffd
+refs/heads/master: 0c5be0cb0edfe3b5c4b62eac68aa2aa15ec681af

trunk/drivers/pci/setup-bus.c

@@ -1292,7 +1292,6 @@ pci_assign_unassigned_resources(void)
 	struct pci_dev_resource *fail_res;
 	unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
 				  IORESOURCE_PREFETCH;
-	unsigned long failed_type;
 	int pci_try_num = 1;
 
 	/* don't realloc if asked to do so */
@@ -1327,16 +1326,7 @@ pci_assign_unassigned_resources(void)
 	if (list_empty(&fail_head))
 		goto enable_and_dump;
 
-	failed_type = 0;
-	list_for_each_entry(fail_res, &fail_head, list)
-		failed_type |= fail_res->flags;
-
-	/*
-	 * io port are tight, don't try extra
-	 * or if reach the limit, don't want to try more
-	 */
-	failed_type &= type_mask;
-	if ((failed_type == IORESOURCE_IO) || (tried_times >= pci_try_num)) {
+	if (tried_times >= pci_try_num) {
 		free_list(&fail_head);
 		goto enable_and_dump;
 	}