From d8de5ceeaaa3b70d71da027b6dff59d0b9dd3a5a Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 23 Feb 2012 19:23:29 -0800 Subject: [PATCH] --- yaml --- r: 294735 b: refs/heads/master c: 0c5be0cb0edfe3b5c4b62eac68aa2aa15ec681af h: refs/heads/master i: 294733: 521d3d017d7952fa348cc9da9ff4a1d31c105a99 294731: 946316f62c8aa0827776e27454461e78a055c43a 294727: 47b572e463ea986eddb2df6684c447607b1b54ea 294719: 9a29af615f5975b49947982c48d12ba162a97576 v: v3 --- [refs] | 2 +- trunk/drivers/pci/setup-bus.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 3c8eb2623e2d..bb829a1b362e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 823806ff6bd63f92644a5330cf0c3b68fac25ffd +refs/heads/master: 0c5be0cb0edfe3b5c4b62eac68aa2aa15ec681af diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c index 2991a8975064..162edfb356b6 100644 --- a/trunk/drivers/pci/setup-bus.c +++ b/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; }