mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-14 06:35:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'acpi-pci-hotplug' into acpi-hotplug

Browse source
This commit is contained in:
Rafael J. Wysocki 2014-03-06 00:48:26 +01:00
commit d901188f00
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/pci/hotplug/acpiphp_glue.c
View file

@ -668,12 +668,9 @@ static void trim_stale_devices(struct pci_dev *dev)
alive = (ACPI_SUCCESS(status) && device_status_valid(sta))
|| acpiphp_no_hotplug(adev);
}
if (!alive) {
u32 v;
if (!alive)
alive = pci_device_is_present(dev);
/* Check if the device responds. */
alive = pci_bus_read_dev_vendor_id(dev->bus, dev->devfn, &v, 0);
}
if (!alive) {
pci_stop_and_remove_bus_device(dev);
if (adev)