diff options
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 75b7c572ef45..0302dd454e17 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1580,15 +1580,12 @@ int acpi_bus_trim(struct acpi_device *start, int rmdevice) | |||
1580 | } | 1580 | } |
1581 | EXPORT_SYMBOL_GPL(acpi_bus_trim); | 1581 | EXPORT_SYMBOL_GPL(acpi_bus_trim); |
1582 | 1582 | ||
1583 | static int acpi_bus_scan_fixed(struct acpi_device *root) | 1583 | static int acpi_bus_scan_fixed(void) |
1584 | { | 1584 | { |
1585 | int result = 0; | 1585 | int result = 0; |
1586 | struct acpi_device *device = NULL; | 1586 | struct acpi_device *device = NULL; |
1587 | struct acpi_bus_ops ops; | 1587 | struct acpi_bus_ops ops; |
1588 | 1588 | ||
1589 | if (!root) | ||
1590 | return -ENODEV; | ||
1591 | |||
1592 | memset(&ops, 0, sizeof(ops)); | 1589 | memset(&ops, 0, sizeof(ops)); |
1593 | ops.acpi_op_add = 1; | 1590 | ops.acpi_op_add = 1; |
1594 | ops.acpi_op_start = 1; | 1591 | ops.acpi_op_start = 1; |
@@ -1639,7 +1636,7 @@ int __init acpi_scan_init(void) | |||
1639 | /* | 1636 | /* |
1640 | * Enumerate devices in the ACPI namespace. | 1637 | * Enumerate devices in the ACPI namespace. |
1641 | */ | 1638 | */ |
1642 | result = acpi_bus_scan_fixed(acpi_root); | 1639 | result = acpi_bus_scan_fixed(); |
1643 | 1640 | ||
1644 | if (!result) | 1641 | if (!result) |
1645 | result = acpi_bus_scan(acpi_root, &ops); | 1642 | result = acpi_bus_scan(acpi_root, &ops); |