diff options
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 3a10d7573477..c98f88b28948 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1567,13 +1567,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type, | |||
1567 | return 0; | 1567 | return 0; |
1568 | } | 1568 | } |
1569 | 1569 | ||
1570 | bool acpi_device_is_present(struct acpi_device *adev) | 1570 | bool acpi_device_is_present(const struct acpi_device *adev) |
1571 | { | 1571 | { |
1572 | if (adev->status.present || adev->status.functional) | 1572 | return adev->status.present || adev->status.functional; |
1573 | return true; | ||
1574 | |||
1575 | adev->flags.initialized = false; | ||
1576 | return false; | ||
1577 | } | 1573 | } |
1578 | 1574 | ||
1579 | static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler, | 1575 | static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler, |
@@ -1831,6 +1827,7 @@ static void acpi_bus_attach(struct acpi_device *device) | |||
1831 | acpi_bus_get_status(device); | 1827 | acpi_bus_get_status(device); |
1832 | /* Skip devices that are not present. */ | 1828 | /* Skip devices that are not present. */ |
1833 | if (!acpi_device_is_present(device)) { | 1829 | if (!acpi_device_is_present(device)) { |
1830 | device->flags.initialized = false; | ||
1834 | acpi_device_clear_enumerated(device); | 1831 | acpi_device_clear_enumerated(device); |
1835 | device->flags.power_manageable = 0; | 1832 | device->flags.power_manageable = 0; |
1836 | return; | 1833 | return; |