Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 316434
b: refs/heads/master
c: 2661b81
h: refs/heads/master
v: v3
  • Loading branch information
Yinghai Lu authored and Bjorn Helgaas committed Jun 13, 2012
1 parent fe32bc9 commit acb94cb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a10bb128b64fe03198c4930f4483dda55c5c84eb
refs/heads/master: 2661b819a10d432aa6f508630ff72e31367d4f21
4 changes: 3 additions & 1 deletion trunk/arch/ia64/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,8 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
#endif

INIT_LIST_HEAD(&info.resources);
/* insert busn resource at first */
pci_add_resource(&info.resources, &root->secondary);
acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,
&windows);
if (windows) {
Expand Down Expand Up @@ -384,7 +386,7 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
return NULL;
}

pbus->busn_res.end = pci_scan_child_bus(pbus);
pci_scan_child_bus(pbus);
return pbus;

out3:
Expand Down

0 comments on commit acb94cb

Please sign in to comment.