Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 166374
b: refs/heads/master
c: e8b945c
h: refs/heads/master
v: v3
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Sep 25, 2009
1 parent cdf392c commit b53ac08
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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: 29aaefa68f933110e577fbf3ca360c88331e5ff5
refs/heads/master: e8b945c9c155d06e1d1ea594f8e18e01aa36f612
7 changes: 2 additions & 5 deletions trunk/drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1580,15 +1580,12 @@ int acpi_bus_trim(struct acpi_device *start, int rmdevice)
}
EXPORT_SYMBOL_GPL(acpi_bus_trim);

static int acpi_bus_scan_fixed(struct acpi_device *root)
static int acpi_bus_scan_fixed(void)
{
int result = 0;
struct acpi_device *device = NULL;
struct acpi_bus_ops ops;

if (!root)
return -ENODEV;

memset(&ops, 0, sizeof(ops));
ops.acpi_op_add = 1;
ops.acpi_op_start = 1;
Expand Down Expand Up @@ -1639,7 +1636,7 @@ int __init acpi_scan_init(void)
/*
* Enumerate devices in the ACPI namespace.
*/
result = acpi_bus_scan_fixed(acpi_root);
result = acpi_bus_scan_fixed();

if (!result)
result = acpi_bus_scan(acpi_root, &ops);
Expand Down

0 comments on commit b53ac08

Please sign in to comment.