|
@@ -632,15 +632,14 @@ static void trim_stale_devices(struct pci_dev *dev)
|
|
{
|
|
{
|
|
struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
|
|
struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
|
|
struct pci_bus *bus = dev->subordinate;
|
|
struct pci_bus *bus = dev->subordinate;
|
|
- bool alive = false;
|
|
|
|
|
|
+ bool alive = dev->ignore_hotplug;
|
|
|
|
|
|
if (adev) {
|
|
if (adev) {
|
|
acpi_status status;
|
|
acpi_status status;
|
|
unsigned long long sta;
|
|
unsigned long long sta;
|
|
|
|
|
|
status = acpi_evaluate_integer(adev->handle, "_STA", NULL, &sta);
|
|
status = acpi_evaluate_integer(adev->handle, "_STA", NULL, &sta);
|
|
- alive = (ACPI_SUCCESS(status) && device_status_valid(sta))
|
|
|
|
- || dev->ignore_hotplug;
|
|
|
|
|
|
+ alive = alive || (ACPI_SUCCESS(status) && device_status_valid(sta));
|
|
}
|
|
}
|
|
if (!alive)
|
|
if (!alive)
|
|
alive = pci_device_is_present(dev);
|
|
alive = pci_device_is_present(dev);
|